| From foo@baz Tue Nov 21 13:07:02 CET 2017 |
| From: Huacai Chen <chenhc@lemote.com> |
| Date: Thu, 16 Nov 2017 11:07:15 +0800 |
| Subject: fealnx: Fix building error on MIPS |
| |
| From: Huacai Chen <chenhc@lemote.com> |
| |
| |
| [ 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> |
| --- |
| drivers/net/ethernet/fealnx.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- 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 */ |
| @@ -1632,7 +1632,7 @@ static int netdev_rx(struct net_device * |
| 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++; |
