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/ipv6/sit.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/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 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) |