diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-06-04 01:17:19 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-04 11:27:40 -0400 |
| commit | 5d0ba55b6486f58cc890918d7167063d83f7fbb4 (patch) | |
| tree | 9f9a59cc9fc9d31d7e557c7688a054f8fea8a6ab /net/atm | |
| parent | 4aea39c11c610e411768649fdc04777903ebfe07 (diff) | |
| download | op-kernel-dev-5d0ba55b6486f58cc890918d7167063d83f7fbb4.zip op-kernel-dev-5d0ba55b6486f58cc890918d7167063d83f7fbb4.tar.gz | |
net: use consume_skb() in place of kfree_skb()
Remove some dropwatch/drop_monitor false positives.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/atm')
| -rw-r--r-- | net/atm/lec.c | 6 | ||||
| -rw-r--r-- | net/atm/pppoatm.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c index a7d1721..3da125c 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c @@ -231,9 +231,11 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb, if (skb_headroom(skb) < 2) { pr_debug("reallocating skb\n"); skb2 = skb_realloc_headroom(skb, LEC_HEADER_LEN); - kfree_skb(skb); - if (skb2 == NULL) + if (unlikely(!skb2)) { + kfree_skb(skb); return NETDEV_TX_OK; + } + consume_skb(skb); skb = skb2; } skb_push(skb, 2); diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c index ce1e59f..226dca9 100644 --- a/net/atm/pppoatm.c +++ b/net/atm/pppoatm.c @@ -283,7 +283,7 @@ static int pppoatm_send(struct ppp_channel *chan, struct sk_buff *skb) kfree_skb(n); goto nospace; } - kfree_skb(skb); + consume_skb(skb); skb = n; if (skb == NULL) return DROP_PACKET; |
