net: macb: move checksum clearing outside of spinlock
authorClaudiu Beznea <claudiu.beznea@microchip.com>
Tue, 7 Aug 2018 09:25:13 +0000 (12:25 +0300)
committerDavid S. Miller <davem@davemloft.net>
Tue, 7 Aug 2018 20:18:49 +0000 (13:18 -0700)
Move checksum clearing outside of spinlock. The SKB is protected by
networking lock (HARD_TX_LOCK()).

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cadence/macb_main.c

index bb1d7b8d7dd69ee05d19c80b8a7cc678f5a485bf..332b19c645b4f0fe5bc2460942e42f4d52be5b80 100644 (file)
@@ -1662,6 +1662,11 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
        bool is_lso, is_udp = 0;
        netdev_tx_t ret = NETDEV_TX_OK;
 
+       if (macb_clear_csum(skb)) {
+               dev_kfree_skb_any(skb);
+               return ret;
+       }
+
        is_lso = (skb_shinfo(skb)->gso_size != 0);
 
        if (is_lso) {
@@ -1717,11 +1722,6 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
                return NETDEV_TX_BUSY;
        }
 
-       if (macb_clear_csum(skb)) {
-               dev_kfree_skb_any(skb);
-               goto unlock;
-       }
-
        /* Map socket buffer for DMA transfer */
        if (!macb_tx_map(bp, queue, skb, hdrlen)) {
                dev_kfree_skb_any(skb);