tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

r8169: remove not needed check in rtl8169_start_xmit

In rtl_tx() the released descriptors are zero'ed by
rtl8169_unmap_tx_skb(). And in the beginning of rtl8169_start_xmit()
we check that enough descriptors are free, therefore there's no way
the DescOwn bit can be set here.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/6965d665-6c50-90c5-70e6-0bb335d4ea47@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Heiner Kallweit and committed by
Jakub Kicinski bd4bdeb4 281cc284

+2 -5
+2 -5
drivers/net/ethernet/realtek/r8169_main.c
··· 4180 4180 bool stop_queue, door_bell; 4181 4181 u32 opts[2]; 4182 4182 4183 - txd_first = tp->TxDescArray + entry; 4184 - 4185 4183 if (unlikely(!rtl_tx_slots_avail(tp))) { 4186 4184 if (net_ratelimit()) 4187 4185 netdev_err(dev, "BUG! Tx Ring full when queue awake!\n"); 4188 4186 goto err_stop_0; 4189 4187 } 4190 - 4191 - if (unlikely(le32_to_cpu(txd_first->opts1) & DescOwn)) 4192 - goto err_stop_0; 4193 4188 4194 4189 opts[1] = rtl8169_tx_vlan_tag(skb); 4195 4190 opts[0] = 0; ··· 4197 4202 if (unlikely(rtl8169_tx_map(tp, opts, skb_headlen(skb), skb->data, 4198 4203 entry, false))) 4199 4204 goto err_dma_0; 4205 + 4206 + txd_first = tp->TxDescArray + entry; 4200 4207 4201 4208 if (frags) { 4202 4209 if (rtl8169_xmit_frags(tp, skb, opts, entry))