Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e823c903 authored by Huacai Chen's avatar Huacai Chen Committed by Greg Kroah-Hartman
Browse files

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: default avatarHuacai Chen <chenhc@lemote.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 39c3fff9

drivers/net/ethernet/fealnx.c

+3 −3
Original line number Diff line number Diff line
@@ -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++;