diff options
| author | Gao feng <gaofeng@cn.fujitsu.com> | 2013-11-25 17:21:24 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-28 18:34:13 -0500 |
| commit | 66028310aedc782e3a9a221f1a9ec12b7e587e50 (patch) | |
| tree | 417c7b48ccce11014ba87262aaaedd645b8bc874 /net/ipv6/sit.c | |
| parent | cd3e22b75c01fe1e075d91504b29019a05d8d373 (diff) | |
| download | op-kernel-dev-66028310aedc782e3a9a221f1a9ec12b7e587e50.zip op-kernel-dev-66028310aedc782e3a9a221f1a9ec12b7e587e50.tar.gz | |
sit: use kfree_skb to replace dev_kfree_skb
In failure case, we should use kfree_skb not
dev_kfree_skb to free skbuff, dev_kfree_skb
is defined as consume_skb.
Trace takes advantage of this point.
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 8435267..366fbba 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -951,7 +951,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, if (!new_skb) { ip_rt_put(rt); dev->stats.tx_dropped++; - dev_kfree_skb(skb); + kfree_skb(skb); return NETDEV_TX_OK; } if (skb->sk) @@ -977,7 +977,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, tx_error_icmp: dst_link_failure(skb); tx_error: - dev_kfree_skb(skb); + kfree_skb(skb); out: dev->stats.tx_errors++; return NETDEV_TX_OK; @@ -1017,7 +1017,7 @@ static netdev_tx_t sit_tunnel_xmit(struct sk_buff *skb, tx_err: dev->stats.tx_errors++; - dev_kfree_skb(skb); + kfree_skb(skb); return NETDEV_TX_OK; } |
