diff options
author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2017-06-01 16:07:15 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-06-01 17:34:56 -0400 |
commit | fe47d563065c91cd30088d9b118b79d44905be6f (patch) | |
tree | a45ba1a54b080a3a71e4650f03d57ac3de3767e8 /net/dsa/tag_ksz.c | |
parent | 5470979585d81271d4338c2accfd5e71dafa4af6 (diff) | |
download | linux-fe47d563065c91cd30088d9b118b79d44905be6f.tar.bz2 |
net: dsa: factor skb freeing on xmit
As of a86d8becc3f0 ("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: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/tag_ksz.c')
-rw-r--r-- | net/dsa/tag_ksz.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c index dfcd2fff5b13..b94a334a1d02 100644 --- a/net/dsa/tag_ksz.c +++ b/net/dsa/tag_ksz.c @@ -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); |