aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuacai Chen <chenhc@lemote.com>2017-11-15 22:07:15 -0500
committerDavid S. Miller <davem@davemloft.net>2017-11-16 08:58:12 -0500
commitcc54c1d32e6a4bb3f116721abf900513173e4d02 (patch)
treef51572e92c73a79c514809e30930f774f5b52ae4
parent6a787d6f593d57bec886718ef3fbbdc5bde70fcb (diff)
fealnx: Fix building error on MIPS
This patch try to fix the building error on MIPS. The reason is MIPS has already defined the LONG macro, which conflicts with the LONG enum in drivers/net/ethernet/fealnx.c. Signed-off-by: Huacai Chen <chenhc@lemote.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/fealnx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
index 23053919ebf5..ae55da60ed0e 100644
--- a/drivers/net/ethernet/fealnx.c
+++ b/drivers/net/ethernet/fealnx.c
@@ -257,8 +257,8 @@ enum rx_desc_status_bits {
257 RXFSD = 0x00000800, /* first descriptor */ 257 RXFSD = 0x00000800, /* first descriptor */
258 RXLSD = 0x00000400, /* last descriptor */ 258 RXLSD = 0x00000400, /* last descriptor */
259 ErrorSummary = 0x80, /* error summary */ 259 ErrorSummary = 0x80, /* error summary */
260 RUNT = 0x40, /* runt packet received */ 260 RUNTPKT = 0x40, /* runt packet received */
261 LONG = 0x20, /* long packet received */ 261 LONGPKT = 0x20, /* long packet received */
262 FAE = 0x10, /* frame align error */ 262 FAE = 0x10, /* frame align error */
263 CRC = 0x08, /* crc error */ 263 CRC = 0x08, /* crc error */
264 RXER = 0x04, /* receive error */ 264 RXER = 0x04, /* receive error */
@@ -1628,7 +1628,7 @@ static int netdev_rx(struct net_device *dev)
1628 dev->name, rx_status); 1628 dev->name, rx_status);
1629 1629
1630 dev->stats.rx_errors++; /* end of a packet. */ 1630 dev->stats.rx_errors++; /* end of a packet. */
1631 if (rx_status & (LONG | RUNT)) 1631 if (rx_status & (LONGPKT | RUNTPKT))
1632 dev->stats.rx_length_errors++; 1632 dev->stats.rx_length_errors++;
1633 if (rx_status & RXER) 1633 if (rx_status & RXER)
1634 dev->stats.rx_frame_errors++; 1634 dev->stats.rx_frame_errors++;