diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-11-26 12:03:19 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-11-26 12:03:19 +0800 |
| commit | d8e6d09cfa7260b12501ce94ca35977be998d4a7 (patch) | |
| tree | 1fe3a34e78b5978fe95fb6ba96f7d070778d5c7a /drivers/net/ethernet/fealnx.c | |
| parent | c0426ccf530144f8af2e68165aa10cc52cd8f803 (diff) | |
| parent | 29ffb9c1fb4acbda207985ad1558191ffb776bee (diff) | |
Merge tag 'v4.4.102' into linux-linaro-lsk-v4.4lsk-v4.4-17.11
This is the 4.4.102 stable release
Diffstat (limited to 'drivers/net/ethernet/fealnx.c')
| -rw-r--r-- | drivers/net/ethernet/fealnx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c index b1b9ebafb354..a3b2e23921bf 100644 --- a/drivers/net/ethernet/fealnx.c +++ b/drivers/net/ethernet/fealnx.c @@ -257,8 +257,8 @@ enum rx_desc_status_bits { RXFSD = 0x00000800, /* first descriptor */ RXLSD = 0x00000400, /* last descriptor */ ErrorSummary = 0x80, /* error summary */ - RUNT = 0x40, /* runt packet received */ - LONG = 0x20, /* long packet received */ + RUNTPKT = 0x40, /* runt packet received */ + LONGPKT = 0x20, /* long packet received */ FAE = 0x10, /* frame align error */ CRC = 0x08, /* crc error */ RXER = 0x04, /* receive error */ @@ -1633,7 +1633,7 @@ static int netdev_rx(struct net_device *dev) dev->name, rx_status); dev->stats.rx_errors++; /* end of a packet. */ - if (rx_status & (LONG | RUNT)) + if (rx_status & (LONGPKT | RUNTPKT)) dev->stats.rx_length_errors++; if (rx_status & RXER) dev->stats.rx_frame_errors++; |