Commit fe47d563 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: factor skb freeing on xmit 



As of a86d8bec ("net: dsa: Factor bottom tag receive functions"),
the rcv caller frees the original SKB in case or error.

Be symmetric with that and make the xmit caller do the same.

At the same time, fix the checkpatch NULL comparison check:

        CHECK: Comparison to NULL could be written "!nskb"
    #208: FILE: net/dsa/tag_trailer.c:35:
    +	if (nskb == NULL)

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 54709795

net/dsa/slave.c

+6 −2
Original line number Diff line number Diff line
@@ -357,10 +357,14 @@ static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev) 
	dev->stats.tx_packets++;

	dev->stats.tx_bytes += skb->len;



	/* Transmit function may have to reallocate the original SKB */

	/* Transmit function may have to reallocate the original SKB,

	 * in which case it must have freed it. Only free it here on error.

	 */

	nskb = p->xmit(skb, dev);

	if (!nskb)

	if (!nskb) {

		kfree_skb(skb);

		return NETDEV_TX_OK;

	}



	/* SKB for netpoll still need to be mangled with the protocol-specific

	 * tag to be successfully transmitted

net/dsa/tag_brcm.c

+1 −5
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static struct sk_buff *brcm_tag_xmit(struct sk_buff *skb, struct net_device *dev 
	u8 *brcm_tag;



	if (skb_cow_head(skb, BRCM_TAG_LEN) < 0)

		goto out_free;

		return NULL;



	skb_push(skb, BRCM_TAG_LEN);
@@ -86,10 +86,6 @@ static struct sk_buff *brcm_tag_xmit(struct sk_buff *skb, struct net_device *dev 
	brcm_tag[3] = (1 << p->dp->index) & BRCM_IG_DSTMAP1_MASK;



	return skb;



out_free:

	kfree_skb(skb);

	return NULL;

}



static struct sk_buff *brcm_tag_rcv(struct sk_buff *skb, struct net_device *dev,

net/dsa/tag_dsa.c

+2 −6
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static struct sk_buff *dsa_xmit(struct sk_buff *skb, struct net_device *dev) 
	 */

	if (skb->protocol == htons(ETH_P_8021Q)) {

		if (skb_cow_head(skb, 0) < 0)

			goto out_free;

			return NULL;



		/*

		 * Construct tagged FROM_CPU DSA tag from 802.1q tag.
@@ -46,7 +46,7 @@ static struct sk_buff *dsa_xmit(struct sk_buff *skb, struct net_device *dev) 
		}

	} else {

		if (skb_cow_head(skb, DSA_HLEN) < 0)

			goto out_free;

			return NULL;

		skb_push(skb, DSA_HLEN);



		memmove(skb->data, skb->data + DSA_HLEN, 2 * ETH_ALEN);
@@ -62,10 +62,6 @@ static struct sk_buff *dsa_xmit(struct sk_buff *skb, struct net_device *dev) 
	}



	return skb;



out_free:

	kfree_skb(skb);

	return NULL;

}



static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct net_device *dev,

net/dsa/tag_edsa.c

+2 −6
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static struct sk_buff *edsa_xmit(struct sk_buff *skb, struct net_device *dev) 
	 */

	if (skb->protocol == htons(ETH_P_8021Q)) {

		if (skb_cow_head(skb, DSA_HLEN) < 0)

			goto out_free;

			return NULL;

		skb_push(skb, DSA_HLEN);



		memmove(skb->data, skb->data + DSA_HLEN, 2 * ETH_ALEN);
@@ -55,7 +55,7 @@ static struct sk_buff *edsa_xmit(struct sk_buff *skb, struct net_device *dev) 
		}

	} else {

		if (skb_cow_head(skb, EDSA_HLEN) < 0)

			goto out_free;

			return NULL;

		skb_push(skb, EDSA_HLEN);



		memmove(skb->data, skb->data + EDSA_HLEN, 2 * ETH_ALEN);
@@ -75,10 +75,6 @@ static struct sk_buff *edsa_xmit(struct sk_buff *skb, struct net_device *dev) 
	}



	return skb;



out_free:

	kfree_skb(skb);

	return NULL;

}



static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct net_device *dev,

net/dsa/tag_ksz.c

+1 −3
Original line number Diff line number Diff line
@@ -46,10 +46,8 @@ static struct sk_buff *ksz_xmit(struct sk_buff *skb, struct net_device *dev) 
	} else {

		nskb = alloc_skb(NET_IP_ALIGN + skb->len +

				 padlen + KSZ_INGRESS_TAG_LEN, GFP_ATOMIC);

		if (!nskb) {

			kfree_skb(skb);

		if (!nskb)

			return NULL;

		}

		skb_reserve(nskb, NET_IP_ALIGN);



		skb_reset_mac_header(nskb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE