diff options
Diffstat (limited to 'net/ipv6/sit.c')
-rw-r--r-- | net/ipv6/sit.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 98b7327d0949..0ae4f6448187 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
@@ -609,7 +609,8 @@ static inline __be32 try_6to4(struct in6_addr *v6dst) | |||
609 | * and that skb is filled properly by that function. | 609 | * and that skb is filled properly by that function. |
610 | */ | 610 | */ |
611 | 611 | ||
612 | static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | 612 | static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, |
613 | struct net_device *dev) | ||
613 | { | 614 | { |
614 | struct ip_tunnel *tunnel = netdev_priv(dev); | 615 | struct ip_tunnel *tunnel = netdev_priv(dev); |
615 | struct net_device_stats *stats = &tunnel->dev->stats; | 616 | struct net_device_stats *stats = &tunnel->dev->stats; |
@@ -753,7 +754,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
753 | stats->tx_dropped++; | 754 | stats->tx_dropped++; |
754 | dev_kfree_skb(skb); | 755 | dev_kfree_skb(skb); |
755 | tunnel->recursion--; | 756 | tunnel->recursion--; |
756 | return 0; | 757 | return NETDEV_TX_OK; |
757 | } | 758 | } |
758 | if (skb->sk) | 759 | if (skb->sk) |
759 | skb_set_owner_w(new_skb, skb->sk); | 760 | skb_set_owner_w(new_skb, skb->sk); |
@@ -778,7 +779,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
778 | iph->version = 4; | 779 | iph->version = 4; |
779 | iph->ihl = sizeof(struct iphdr)>>2; | 780 | iph->ihl = sizeof(struct iphdr)>>2; |
780 | if (mtu > IPV6_MIN_MTU) | 781 | if (mtu > IPV6_MIN_MTU) |
781 | iph->frag_off = htons(IP_DF); | 782 | iph->frag_off = tiph->frag_off; |
782 | else | 783 | else |
783 | iph->frag_off = 0; | 784 | iph->frag_off = 0; |
784 | 785 | ||
@@ -794,7 +795,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
794 | 795 | ||
795 | IPTUNNEL_XMIT(); | 796 | IPTUNNEL_XMIT(); |
796 | tunnel->recursion--; | 797 | tunnel->recursion--; |
797 | return 0; | 798 | return NETDEV_TX_OK; |
798 | 799 | ||
799 | tx_error_icmp: | 800 | tx_error_icmp: |
800 | dst_link_failure(skb); | 801 | dst_link_failure(skb); |
@@ -802,7 +803,7 @@ tx_error: | |||
802 | stats->tx_errors++; | 803 | stats->tx_errors++; |
803 | dev_kfree_skb(skb); | 804 | dev_kfree_skb(skb); |
804 | tunnel->recursion--; | 805 | tunnel->recursion--; |
805 | return 0; | 806 | return NETDEV_TX_OK; |
806 | } | 807 | } |
807 | 808 | ||
808 | static void ipip6_tunnel_bind_dev(struct net_device *dev) | 809 | static void ipip6_tunnel_bind_dev(struct net_device *dev) |