diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/ip_gre.c | 6 | ||||
-rw-r--r-- | net/ipv4/ipip.c | 6 | ||||
-rw-r--r-- | net/ipv4/ipmr.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 44e2a3d2359a..cd85ebc119a5 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
@@ -821,7 +821,7 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
821 | stats->tx_dropped++; | 821 | stats->tx_dropped++; |
822 | dev_kfree_skb(skb); | 822 | dev_kfree_skb(skb); |
823 | tunnel->recursion--; | 823 | tunnel->recursion--; |
824 | return 0; | 824 | return NETDEV_TX_OK; |
825 | } | 825 | } |
826 | if (skb->sk) | 826 | if (skb->sk) |
827 | skb_set_owner_w(new_skb, skb->sk); | 827 | skb_set_owner_w(new_skb, skb->sk); |
@@ -889,7 +889,7 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
889 | 889 | ||
890 | IPTUNNEL_XMIT(); | 890 | IPTUNNEL_XMIT(); |
891 | tunnel->recursion--; | 891 | tunnel->recursion--; |
892 | return 0; | 892 | return NETDEV_TX_OK; |
893 | 893 | ||
894 | tx_error_icmp: | 894 | tx_error_icmp: |
895 | dst_link_failure(skb); | 895 | dst_link_failure(skb); |
@@ -898,7 +898,7 @@ tx_error: | |||
898 | stats->tx_errors++; | 898 | stats->tx_errors++; |
899 | dev_kfree_skb(skb); | 899 | dev_kfree_skb(skb); |
900 | tunnel->recursion--; | 900 | tunnel->recursion--; |
901 | return 0; | 901 | return NETDEV_TX_OK; |
902 | } | 902 | } |
903 | 903 | ||
904 | static int ipgre_tunnel_bind_dev(struct net_device *dev) | 904 | static int ipgre_tunnel_bind_dev(struct net_device *dev) |
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 93e2b787da20..98075b6d619c 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c | |||
@@ -486,7 +486,7 @@ static int ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
486 | stats->tx_dropped++; | 486 | stats->tx_dropped++; |
487 | dev_kfree_skb(skb); | 487 | dev_kfree_skb(skb); |
488 | tunnel->recursion--; | 488 | tunnel->recursion--; |
489 | return 0; | 489 | return NETDEV_TX_OK; |
490 | } | 490 | } |
491 | if (skb->sk) | 491 | if (skb->sk) |
492 | skb_set_owner_w(new_skb, skb->sk); | 492 | skb_set_owner_w(new_skb, skb->sk); |
@@ -524,7 +524,7 @@ static int ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
524 | 524 | ||
525 | IPTUNNEL_XMIT(); | 525 | IPTUNNEL_XMIT(); |
526 | tunnel->recursion--; | 526 | tunnel->recursion--; |
527 | return 0; | 527 | return NETDEV_TX_OK; |
528 | 528 | ||
529 | tx_error_icmp: | 529 | tx_error_icmp: |
530 | dst_link_failure(skb); | 530 | dst_link_failure(skb); |
@@ -532,7 +532,7 @@ tx_error: | |||
532 | stats->tx_errors++; | 532 | stats->tx_errors++; |
533 | dev_kfree_skb(skb); | 533 | dev_kfree_skb(skb); |
534 | tunnel->recursion--; | 534 | tunnel->recursion--; |
535 | return 0; | 535 | return NETDEV_TX_OK; |
536 | } | 536 | } |
537 | 537 | ||
538 | static void ipip_tunnel_bind_dev(struct net_device *dev) | 538 | static void ipip_tunnel_bind_dev(struct net_device *dev) |
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 9a8da5ed92b7..06c33fb6b321 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -212,7 +212,7 @@ static int reg_vif_xmit(struct sk_buff *skb, struct net_device *dev) | |||
212 | IGMPMSG_WHOLEPKT); | 212 | IGMPMSG_WHOLEPKT); |
213 | read_unlock(&mrt_lock); | 213 | read_unlock(&mrt_lock); |
214 | kfree_skb(skb); | 214 | kfree_skb(skb); |
215 | return 0; | 215 | return NETDEV_TX_OK; |
216 | } | 216 | } |
217 | 217 | ||
218 | static const struct net_device_ops reg_vif_netdev_ops = { | 218 | static const struct net_device_ops reg_vif_netdev_ops = { |