Commit cc54c1d3 authored by Huacai Chen's avatar Huacai Chen Committed by David S. Miller

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: default avatarHuacai Chen <chenhc@lemote.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6a787d6f
...@@ -257,8 +257,8 @@ enum rx_desc_status_bits { ...@@ -257,8 +257,8 @@ enum rx_desc_status_bits {
RXFSD = 0x00000800, /* first descriptor */ RXFSD = 0x00000800, /* first descriptor */
RXLSD = 0x00000400, /* last descriptor */ RXLSD = 0x00000400, /* last descriptor */
ErrorSummary = 0x80, /* error summary */ ErrorSummary = 0x80, /* error summary */
RUNT = 0x40, /* runt packet received */ RUNTPKT = 0x40, /* runt packet received */
LONG = 0x20, /* long packet received */ LONGPKT = 0x20, /* long packet received */
FAE = 0x10, /* frame align error */ FAE = 0x10, /* frame align error */
CRC = 0x08, /* crc error */ CRC = 0x08, /* crc error */
RXER = 0x04, /* receive error */ RXER = 0x04, /* receive error */
...@@ -1628,7 +1628,7 @@ static int netdev_rx(struct net_device *dev) ...@@ -1628,7 +1628,7 @@ static int netdev_rx(struct net_device *dev)
dev->name, rx_status); dev->name, rx_status);
dev->stats.rx_errors++; /* end of a packet. */ dev->stats.rx_errors++; /* end of a packet. */
if (rx_status & (LONG | RUNT)) if (rx_status & (LONGPKT | RUNTPKT))
dev->stats.rx_length_errors++; dev->stats.rx_length_errors++;
if (rx_status & RXER) if (rx_status & RXER)
dev->stats.rx_frame_errors++; dev->stats.rx_frame_errors++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment