]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net/sonic: Start packet transmission immediately
authorFinn Thain <fthain@telegraphics.com.au>
Sat, 15 Feb 2020 21:03:32 +0000 (08:03 +1100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Feb 2020 03:48:22 +0000 (19:48 -0800)
Give the transmit command as soon as the transmit descriptor is ready.

Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/natsemi/sonic.c

index 508c6a80fc6eaf7c797f33cbf0a2583749f6e931..dd3605aa5f23fc386d3c6e899298074af9335698 100644 (file)
@@ -311,12 +311,17 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)
        sonic_tda_put(dev, entry, SONIC_TD_LINK,
                sonic_tda_get(dev, entry, SONIC_TD_LINK) | SONIC_EOL);
 
+       sonic_tda_put(dev, lp->eol_tx, SONIC_TD_LINK, ~SONIC_EOL &
+                     sonic_tda_get(dev, lp->eol_tx, SONIC_TD_LINK));
+
+       netif_dbg(lp, tx_queued, dev, "%s: issuing Tx command\n", __func__);
+
+       SONIC_WRITE(SONIC_CMD, SONIC_CR_TXP);
+
        lp->tx_len[entry] = length;
        lp->tx_laddr[entry] = laddr;
        lp->tx_skb[entry] = skb;
 
-       sonic_tda_put(dev, lp->eol_tx, SONIC_TD_LINK,
-                                 sonic_tda_get(dev, lp->eol_tx, SONIC_TD_LINK) & ~SONIC_EOL);
        lp->eol_tx = entry;
 
        entry = (entry + 1) & SONIC_TDS_MASK;
@@ -327,10 +332,6 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)
                /* after this packet, wait for ISR to free up some TDAs */
        }
 
-       netif_dbg(lp, tx_queued, dev, "%s: issuing Tx command\n", __func__);
-
-       SONIC_WRITE(SONIC_CMD, SONIC_CR_TXP);
-
        spin_unlock_irqrestore(&lp->lock, flags);
 
        return NETDEV_TX_OK;