From: Heiner Kallweit <hkallweit1@gmail.com>
To: David Miller <davem@davemloft.net>,
Realtek linux nic maintainers <nic_swsd@realtek.com>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [PATCH net-next 09/11] r8169: remove workaround for ancient gcc bug
Date: Mon, 19 Nov 2018 22:39:14 +0100 [thread overview]
Message-ID: <b195baf8-4c10-3997-cce1-d9ce46b3c71e@gmail.com> (raw)
In-Reply-To: <7484b166-100b-52b9-1539-22e9199a8a3a@gmail.com>
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>
---
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
next prev parent reply other threads:[~2018-11-20 8:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-19 21:30 [PATCH net-next 00/11] r8169: series with further smaller improvements Heiner Kallweit
2018-11-19 21:31 ` [PATCH net-next 01/11] r8169: merge rtl_irq_enable and rtl_irq_enable_all Heiner Kallweit
2018-11-19 21:32 ` [PATCH net-next 02/11] r8169: use dev_get_drvdata where possible Heiner Kallweit
2018-11-19 21:33 ` [PATCH net-next 03/11] r8169: remove unused interrupt sources Heiner Kallweit
2018-11-19 21:34 ` [PATCH net-next 04/11] r8169: replace event_slow with irq_mask Heiner Kallweit
2018-11-19 21:35 ` [PATCH net-next 05/11] r8169: use PCI_VDEVICE macro Heiner Kallweit
2018-11-19 21:36 ` [PATCH net-next 06/11] r8169: remove print_mac_version Heiner Kallweit
2018-11-19 21:37 ` [PATCH net-next 07/11] r8169: remove "not PCI Express" message Heiner Kallweit
2018-11-19 21:38 ` [PATCH net-next 08/11] r8169: remove manual padding in struct ring_info Heiner Kallweit
2018-11-19 21:39 ` Heiner Kallweit [this message]
2018-11-19 21:40 ` [PATCH net-next 10/11] r8169: simplify ocp functions Heiner Kallweit
2018-11-19 21:41 ` [PATCH net-next 11/11] r8169: improve chip version identification Heiner Kallweit
2018-11-20 1:32 ` [PATCH net-next 00/11] r8169: series with further smaller improvements David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b195baf8-4c10-3997-cce1-d9ce46b3c71e@gmail.com \
--to=hkallweit1@gmail.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).