diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-08-24 06:40:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-24 07:13:34 +0200 |
| commit | 2b33bc8aa236b75d6e86a8a79126fd9739e4a5bd (patch) | |
| tree | 2050a523f336a838a9e55e6be51e9b417d11d0d8 /net/dsa | |
| parent | Merge branch 'nfp-fixes' (diff) | |
| download | linux-2b33bc8aa236b75d6e86a8a79126fd9739e4a5bd.tar.xz linux-2b33bc8aa236b75d6e86a8a79126fd9739e4a5bd.zip | |
net: dsa: use consume_skb()
Two kfree_skb() should be consume_skb(), to be friend with drop monitor
(perf record ... -e skb:kfree_skb)
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/tag_ksz.c | 2 | ||||
| -rw-r--r-- | net/dsa/tag_trailer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c index 3bd6e2a83125..fcd90f79458e 100644 --- a/net/dsa/tag_ksz.c +++ b/net/dsa/tag_ksz.c @@ -67,7 +67,7 @@ static struct sk_buff *ksz_xmit(struct sk_buff *skb, struct net_device *dev) if (skb_put_padto(nskb, nskb->len + padlen)) return NULL; - kfree_skb(skb); + consume_skb(skb); } tag = skb_put(nskb, KSZ_INGRESS_TAG_LEN); diff --git a/net/dsa/tag_trailer.c b/net/dsa/tag_trailer.c index b09e56214005..9c7b1d74a5c6 100644 --- a/net/dsa/tag_trailer.c +++ b/net/dsa/tag_trailer.c @@ -40,7 +40,7 @@ static struct sk_buff *trailer_xmit(struct sk_buff *skb, struct net_device *dev) skb_set_network_header(nskb, skb_network_header(skb) - skb->head); skb_set_transport_header(nskb, skb_transport_header(skb) - skb->head); skb_copy_and_csum_dev(skb, skb_put(nskb, skb->len)); - kfree_skb(skb); + consume_skb(skb); if (padlen) { skb_put_zero(nskb, padlen); |