aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2018-11-19 22:39:14 +0100
committerDavid S. Miller <davem@davemloft.net>2018-11-19 17:32:15 -0800
commit8b6dd85666e217c1e16396b08ccb855524025f28 (patch)
tree4e1e947fe168d9a93bbaa91edff3e788f70d156a /drivers
parentr8169: remove manual padding in struct ring_info (diff)
downloadlinux-dev-8b6dd85666e217c1e16396b08ccb855524025f28.tar.xz
linux-dev-8b6dd85666e217c1e16396b08ccb855524025f28.zip
r8169: remove workaround for ancient gcc bug
The kernel can't be built any longer with this ancient GCC version. Eventually it becomes clear what this statement actually does. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/realtek/r8169.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 0f74576db989..3eb01a40fba2 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -5903,9 +5903,9 @@ static int rtl8169_xmit_frags(struct rtl8169_private *tp, struct sk_buff *skb,
goto err_out;
}
- /* Anti gcc 2.95.3 bugware (sic) */
- status = opts[0] | len |
- (RingEnd * !((entry + 1) % NUM_TX_DESC));
+ status = opts[0] | len;
+ if (entry == NUM_TX_DESC - 1)
+ status |= RingEnd;
txd->opts1 = cpu_to_le32(status);
txd->opts2 = cpu_to_le32(opts[1]);