diff options
author | Patrick McHardy <kaber@trash.net> | 2009-06-23 02:03:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-05 22:16:04 -0400 |
commit | 6ed106549d17474ca17a16057f4c0ed4eba5a7ca (patch) | |
tree | b98c09081509b3a9757339b6b66779e4126dfa29 /net/ipv4/ip_gre.c | |
parent | 0e8635a8e1f2d4a9e1bfc6c3b21419a5921e674f (diff) |
net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions
This patch is the result of an automatic spatch transformation to convert
all ndo_start_xmit() return values of 0 to NETDEV_TX_OK.
Some occurences are missed by the automatic conversion, those will be
handled in a seperate patch.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_gre.c')
-rw-r--r-- | net/ipv4/ip_gre.c | 6 |
1 files changed, 3 insertions, 3 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) |