diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/ip6_tunnel.c | 4 | ||||
-rw-r--r-- | net/ipv6/ip6mr.c | 2 | ||||
-rw-r--r-- | net/ipv6/sit.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 51f410e7775a..a1d6045c4694 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
@@ -1063,14 +1063,14 @@ ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1063 | goto tx_err; | 1063 | goto tx_err; |
1064 | 1064 | ||
1065 | t->recursion--; | 1065 | t->recursion--; |
1066 | return 0; | 1066 | return NETDEV_TX_OK; |
1067 | 1067 | ||
1068 | tx_err: | 1068 | tx_err: |
1069 | stats->tx_errors++; | 1069 | stats->tx_errors++; |
1070 | stats->tx_dropped++; | 1070 | stats->tx_dropped++; |
1071 | kfree_skb(skb); | 1071 | kfree_skb(skb); |
1072 | t->recursion--; | 1072 | t->recursion--; |
1073 | return 0; | 1073 | return NETDEV_TX_OK; |
1074 | } | 1074 | } |
1075 | 1075 | ||
1076 | static void ip6_tnl_set_cap(struct ip6_tnl *t) | 1076 | static void ip6_tnl_set_cap(struct ip6_tnl *t) |
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index c769f155c698..07ded5075b33 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c | |||
@@ -427,7 +427,7 @@ static int reg_vif_xmit(struct sk_buff *skb, struct net_device *dev) | |||
427 | MRT6MSG_WHOLEPKT); | 427 | MRT6MSG_WHOLEPKT); |
428 | read_unlock(&mrt_lock); | 428 | read_unlock(&mrt_lock); |
429 | kfree_skb(skb); | 429 | kfree_skb(skb); |
430 | return 0; | 430 | return NETDEV_TX_OK; |
431 | } | 431 | } |
432 | 432 | ||
433 | static const struct net_device_ops reg_vif_netdev_ops = { | 433 | static const struct net_device_ops reg_vif_netdev_ops = { |
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 68e52308e552..d0b850590faf 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
@@ -753,7 +753,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
753 | stats->tx_dropped++; | 753 | stats->tx_dropped++; |
754 | dev_kfree_skb(skb); | 754 | dev_kfree_skb(skb); |
755 | tunnel->recursion--; | 755 | tunnel->recursion--; |
756 | return 0; | 756 | return NETDEV_TX_OK; |
757 | } | 757 | } |
758 | if (skb->sk) | 758 | if (skb->sk) |
759 | skb_set_owner_w(new_skb, skb->sk); | 759 | skb_set_owner_w(new_skb, skb->sk); |
@@ -794,7 +794,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
794 | 794 | ||
795 | IPTUNNEL_XMIT(); | 795 | IPTUNNEL_XMIT(); |
796 | tunnel->recursion--; | 796 | tunnel->recursion--; |
797 | return 0; | 797 | return NETDEV_TX_OK; |
798 | 798 | ||
799 | tx_error_icmp: | 799 | tx_error_icmp: |
800 | dst_link_failure(skb); | 800 | dst_link_failure(skb); |
@@ -802,7 +802,7 @@ tx_error: | |||
802 | stats->tx_errors++; | 802 | stats->tx_errors++; |
803 | dev_kfree_skb(skb); | 803 | dev_kfree_skb(skb); |
804 | tunnel->recursion--; | 804 | tunnel->recursion--; |
805 | return 0; | 805 | return NETDEV_TX_OK; |
806 | } | 806 | } |
807 | 807 | ||
808 | static void ipip6_tunnel_bind_dev(struct net_device *dev) | 808 | static void ipip6_tunnel_bind_dev(struct net_device *dev) |