diff options
| author | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-11-14 13:35:54 (GMT) |
|---|---|---|
| committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:40:41 (GMT) |
| commit | 731a7f815cc8d300d51b96eeacc058295dc61402 (patch) | |
| tree | a8d02c4fc62ae5c01039215d1ef60db2c8090e2f /drivers/net/ethernet/freescale/fman/Peripherals/FM/Port/fm_port_im.c | |
| parent | 6337363a3c85f8da8a524a56c32829dbd7ae3433 (diff) | |
| download | linux-fsl-qoriq-731a7f815cc8d300d51b96eeacc058295dc61402.tar.xz | |
Revert "fmd: fix static analysis issues"
This reverts commit 5e921ed07acbc6f05536aac89b9edc2578663840.
Change-Id: Ic4d1166b5ad6419f369e3be278f41ea5764ff6fc
Reviewed-on: http://git.am.freescale.net:8181/23784
Reviewed-by: Matthew Weigel <Matthew.Weigel@freescale.com>
Tested-by: Matthew Weigel <Matthew.Weigel@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/fman/Peripherals/FM/Port/fm_port_im.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/Peripherals/FM/Port/fm_port_im.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ethernet/freescale/fman/Peripherals/FM/Port/fm_port_im.c b/drivers/net/ethernet/freescale/fman/Peripherals/FM/Port/fm_port_im.c index 8de8f5f..7f70cc9 100644 --- a/drivers/net/ethernet/freescale/fman/Peripherals/FM/Port/fm_port_im.c +++ b/drivers/net/ethernet/freescale/fman/Peripherals/FM/Port/fm_port_im.c @@ -39,7 +39,6 @@ #include "std_ext.h" #include "string_ext.h" #include "error_ext.h" -#include "memcpy_ext.h" #include "fm_muram_ext.h" #include "fm_port.h" @@ -141,7 +140,7 @@ t_Error FmPortImRx(t_FmPort *p_FmPort) uint32_t bdStatus; volatile uint8_t buffPos; uint16_t length; - uint16_t errors; + uint16_t errors/*, reportErrors*/; uint8_t *p_CurData, *p_Data; uint32_t flags; @@ -169,6 +168,7 @@ t_Error FmPortImRx(t_FmPort *p_FmPort) if (p_FmPort->im.firstBdOfFrameId == IM_ILEGAL_BD_ID) p_FmPort->im.firstBdOfFrameId = p_FmPort->im.currBdId; + errors = 0; p_CurData = BdBufferGet(p_FmPort->im.rxPool.f_PhysToVirt, BD_GET(p_FmPort->im.currBdId)); h_CurrUserPriv = p_FmPort->im.p_BdShadow[p_FmPort->im.currBdId]; length = (uint16_t)((bdStatus & BD_L) ? @@ -199,8 +199,9 @@ t_Error FmPortImRx(t_FmPort *p_FmPort) WRITE_UINT16(p_FmPort->im.p_FmPortImPram->rxQd.offsetOut, (uint16_t)(p_FmPort->im.currBdId<<4)); /* Pass the buffer if one of the conditions is true: - There are no errors - - This is a part of a larger frame ( the application has already received some buffers ) */ - if ((buffPos != SINGLE_BUF) || !errors) + - This is a part of a larger frame ( the application has already received some buffers ) + - There is an error, but it was defined to be passed anyway. */ + if ((buffPos != SINGLE_BUF) || !errors || (errors & (uint16_t)(BD_ERROR_PASS_FRAME>>16))) { if (p_FmPort->im.f_RxStore(p_FmPort->h_App, p_CurData, |