From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiner Kallweit Subject: [PATCH net-next 09/11] r8169: remove workaround for ancient gcc bug Date: Mon, 19 Nov 2018 22:39:14 +0100 Message-ID: References: <7484b166-100b-52b9-1539-22e9199a8a3a@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: "netdev@vger.kernel.org" To: David Miller , Realtek linux nic maintainers Return-path: Received: from mail-wr1-f65.google.com ([209.85.221.65]:43892 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731082AbeKTIHl (ORCPT ); Tue, 20 Nov 2018 03:07:41 -0500 Received: by mail-wr1-f65.google.com with SMTP id r10so16083342wrs.10 for ; Mon, 19 Nov 2018 13:42:04 -0800 (PST) In-Reply-To: <7484b166-100b-52b9-1539-22e9199a8a3a@gmail.com> Content-Language: en-US Sender: netdev-owner@vger.kernel.org List-ID: 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 --- drivers/net/ethernet/realtek/r8169.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 6736b804c..b5f9c3511 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]); -- 2.19.1