diff options
| author |   Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2012-02-15 00:10:37 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-02-15 14:52:10 -0500 |
| commit | 1cc5a735185a963ed9324a65e1f2db02bf52c0d4 (patch) | |
| tree | 5e280cb7f6626080ab4ab8e2be01841fbaf6c4f6 /drivers/net/ethernet/stmicro/stmmac/enh_desc.c | |
| parent | ipheth: Add iPhone 4S (diff) | |
| download | linux-dev-1cc5a735185a963ed9324a65e1f2db02bf52c0d4.tar.xz linux-dev-1cc5a735185a963ed9324a65e1f2db02bf52c0d4.zip | |
stmmac: do not discard frame on dribbling bit assert
If this bit is set and the CRC error is reset, then the packet is valid.
Only report this as stat info.
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/enh_desc.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c index d87976364ec5..ad1b627f8ec2 100644 --- a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c +++ b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c @@ -201,7 +201,7 @@ static int enh_desc_get_rx_status(void *data, struct stmmac_extra_stats *x, if (unlikely(p->des01.erx.dribbling)) { CHIP_DBG(KERN_ERR "GMAC RX: dribbling error\n"); - ret = discard_frame; + x->dribbling_bit++; } if (unlikely(p->des01.erx.sa_filter_fail)) { CHIP_DBG(KERN_ERR "GMAC RX : Source Address filter fail\n"); |