diff options
author | Gao feng <gaofeng@cn.fujitsu.com> | 2013-11-25 04:21:24 -0500 |
---|---|---|
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) |
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 8435267836a7..366fbba3359a 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, | |||
951 | if (!new_skb) { | 951 | if (!new_skb) { |
952 | ip_rt_put(rt); | 952 | ip_rt_put(rt); |
953 | dev->stats.tx_dropped++; | 953 | dev->stats.tx_dropped++; |
954 | dev_kfree_skb(skb); | 954 | kfree_skb(skb); |
955 | return NETDEV_TX_OK; | 955 | return NETDEV_TX_OK; |
956 | } | 956 | } |
957 | if (skb->sk) | 957 | if (skb->sk) |
@@ -977,7 +977,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, | |||
977 | tx_error_icmp: | 977 | tx_error_icmp: |
978 | dst_link_failure(skb); | 978 | dst_link_failure(skb); |
979 | tx_error: | 979 | tx_error: |
980 | dev_kfree_skb(skb); | 980 | kfree_skb(skb); |
981 | out: | 981 | out: |
982 | dev->stats.tx_errors++; | 982 | dev->stats.tx_errors++; |
983 | return NETDEV_TX_OK; | 983 | return NETDEV_TX_OK; |
@@ -1017,7 +1017,7 @@ static netdev_tx_t sit_tunnel_xmit(struct sk_buff *skb, | |||
1017 | 1017 | ||
1018 | tx_err: | 1018 | tx_err: |
1019 | dev->stats.tx_errors++; | 1019 | dev->stats.tx_errors++; |
1020 | dev_kfree_skb(skb); | 1020 | kfree_skb(skb); |
1021 | return NETDEV_TX_OK; | 1021 | return NETDEV_TX_OK; |
1022 | 1022 | ||
1023 | } | 1023 | } |