r8169: remove not needed check in rtl8169_start_xmit
Heiner Kallweit
maintainerPATCH 1/1 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 <[email protected]>
--- drivers/net/ethernet/realtek/r8169_main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +2 -5
@@ -4180,17 +4180,12 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,bool stop_queue, door_bell;u32 opts[2 ]; - txd_first = tp->TxDescArray + entry; -if (unlikely (!rtl_tx_slots_avail (tp))) {if (net_ratelimit ())netdev_err (dev,"BUG! Tx Ring full when queue awake!\n" ); goto err_stop_0; } -if (unlikely (le32_to_cpu (txd_first->opts1) & DescOwn)) - goto err_stop_0; - opts[1 ] =rtl8169_tx_vlan_tag (skb); opts[0 ] =0 ;
@@ -4203,6 +4198,8 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, entry, false))) goto err_dma_0; + txd_first = tp->TxDescArray + entry; +if (frags) {if (rtl8169_xmit_frags (tp, skb, opts, entry)) goto err_dma_1;
Signature · 1 line
2.29.2
Quoted 6 lines · On Tue, 17 Nov 2020 21:34:09 +0100 Heiner Kallweit wrote:
In
rtl_tx()the released descriptors are zero'ed byrtl8169_unmap_tx_skb(). And in the beginning ofrtl8169_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 <[email protected]>
Applied, thanks!