Skip to content

Commit ae93cef

Browse files
chenhuacaigregkh
authored andcommitted
fealnx: Fix building error on MIPS
[ Upstream commit cc54c1d32e6a4bb3f116721abf900513173e4d02 ] 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 2a0e609 commit ae93cef

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/net/ethernet/fealnx.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ enum rx_desc_status_bits {
257257
RXFSD = 0x00000800, /* first descriptor */
258258
RXLSD = 0x00000400, /* last descriptor */
259259
ErrorSummary = 0x80, /* error summary */
260-
RUNT = 0x40, /* runt packet received */
261-
LONG = 0x20, /* long packet received */
260+
RUNTPKT = 0x40, /* runt packet received */
261+
LONGPKT = 0x20, /* long packet received */
262262
FAE = 0x10, /* frame align error */
263263
CRC = 0x08, /* crc error */
264264
RXER = 0x04, /* receive error */
@@ -1633,7 +1633,7 @@ static int netdev_rx(struct net_device *dev)
16331633
dev->name, rx_status);
16341634

16351635
dev->stats.rx_errors++; /* end of a packet. */
1636-
if (rx_status & (LONG | RUNT))
1636+
if (rx_status & (LONGPKT | RUNTPKT))
16371637
dev->stats.rx_length_errors++;
16381638
if (rx_status & RXER)
16391639
dev->stats.rx_frame_errors++;

0 commit comments

Comments
 (0)