diff options
| author | Mandy Lavi <mandy.lavi@freescale.com> | 2015-02-12 10:51:24 (GMT) |
|---|---|---|
| committer | Honghua Yin <Hong-Hua.Yin@freescale.com> | 2015-03-25 07:20:00 (GMT) |
| commit | 4baa9590894a23bfe2e4007d5b0bff019f70dfe9 (patch) | |
| tree | 7c887cb5bb5097a138ca12c0213258463ef9bbff | |
| parent | cde1a35b0a103efd7d218e1e099a65fccaccc4ec (diff) | |
| download | linux-fsl-qoriq-4baa9590894a23bfe2e4007d5b0bff019f70dfe9.tar.xz | |
fmd: Base cascading decision on current reparsing option
fm_manip.c - Base cascading decision on current reparsing
option rather than the next one
Change-Id: Ic24a9c4c441337548d8f5a1c6a09d5409276e37a
Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com>
Reviewed-on: http://git.am.freescale.net:8181/30768
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Eyal Harari <Eyal.Harari@freescale.com>
Reviewed-by: Nir Erez <nir.erez@freescale.com>
Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
Reviewed-on: http://git.am.freescale.net:8181/33215
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c b/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c index a21516b..ba81535 100644 --- a/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c +++ b/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c @@ -1014,10 +1014,10 @@ static t_Error BuildHmct(t_FmPcdManip *p_Manip, } - /* If this node has a nextManip, and no parsing is required after it, the old table must be copied to the new table - the old table and should be freed */ - if (p_FmPcdManipParams->h_NextManip - && (MANIP_DONT_REPARSE(p_FmPcdManipParams->h_NextManip))) + /* If this node has a nextManip, and no parsing is required, the old table must be copied to the new table + the old table and should be freed */ + if (p_FmPcdManipParams->h_NextManip && + (MANIP_DONT_REPARSE(p_Manip))) { if (new) { @@ -1060,9 +1060,8 @@ static t_Error CreateManipActionNew(t_FmPcdManip *p_Manip, /* set Manip structure */ if (p_FmPcdManipParams->h_NextManip) { - if (MANIP_DONT_REPARSE(p_FmPcdManipParams->h_NextManip)) - nextSize = (uint32_t)(GetHmctSize(p_FmPcdManipParams->h_NextManip) - + GetDataSize(p_FmPcdManipParams->h_NextManip)); + if (p_FmPcdManipParams->u.hdr.dontParseAfterManip) + nextSize = (uint32_t)(GetHmctSize(p_FmPcdManipParams->h_NextManip) + GetDataSize(p_FmPcdManipParams->h_NextManip)); else p_Manip->cascadedNext = TRUE; } @@ -1106,8 +1105,9 @@ static t_Error CreateManipActionNew(t_FmPcdManip *p_Manip, ("MURAM allocation for HdrManip node shadow")); } - if (p_FmPcdManipParams->h_NextManip - && (MANIP_DONT_REPARSE(p_FmPcdManipParams->h_NextManip))) + + if (p_FmPcdManipParams->h_NextManip && + (MANIP_DONT_REPARSE(p_Manip))) { p_OldHmct = (uint8_t *)GetManipInfo(p_FmPcdManipParams->h_NextManip, e_MANIP_HMCT); @@ -1161,8 +1161,8 @@ static t_Error CreateManipActionNew(t_FmPcdManip *p_Manip, if (!p_Manip->dontParseAfterManip) tmpReg |= HMTD_CFG_PRS_AFTER_HM; /* create cascade */ - if (p_FmPcdManipParams->h_NextManip - && !MANIP_DONT_REPARSE(p_FmPcdManipParams->h_NextManip)) + if (p_FmPcdManipParams->h_NextManip && + !MANIP_DONT_REPARSE(p_Manip)) { /* indicate that there's another HM table descriptor */ tmpReg |= HMTD_CFG_NEXT_AD_EN; |