diff options
Diffstat (limited to 'net/ipv6/sit.c')
-rw-r--r-- | net/ipv6/sit.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 0ae4f6448187..fcb539628847 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
@@ -626,11 +626,6 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, | |||
626 | struct in6_addr *addr6; | 626 | struct in6_addr *addr6; |
627 | int addr_type; | 627 | int addr_type; |
628 | 628 | ||
629 | if (tunnel->recursion++) { | ||
630 | stats->collisions++; | ||
631 | goto tx_error; | ||
632 | } | ||
633 | |||
634 | if (skb->protocol != htons(ETH_P_IPV6)) | 629 | if (skb->protocol != htons(ETH_P_IPV6)) |
635 | goto tx_error; | 630 | goto tx_error; |
636 | 631 | ||
@@ -753,7 +748,6 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, | |||
753 | ip_rt_put(rt); | 748 | ip_rt_put(rt); |
754 | stats->tx_dropped++; | 749 | stats->tx_dropped++; |
755 | dev_kfree_skb(skb); | 750 | dev_kfree_skb(skb); |
756 | tunnel->recursion--; | ||
757 | return NETDEV_TX_OK; | 751 | return NETDEV_TX_OK; |
758 | } | 752 | } |
759 | if (skb->sk) | 753 | if (skb->sk) |
@@ -794,7 +788,6 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb, | |||
794 | nf_reset(skb); | 788 | nf_reset(skb); |
795 | 789 | ||
796 | IPTUNNEL_XMIT(); | 790 | IPTUNNEL_XMIT(); |
797 | tunnel->recursion--; | ||
798 | return NETDEV_TX_OK; | 791 | return NETDEV_TX_OK; |
799 | 792 | ||
800 | tx_error_icmp: | 793 | tx_error_icmp: |
@@ -802,7 +795,6 @@ tx_error_icmp: | |||
802 | tx_error: | 795 | tx_error: |
803 | stats->tx_errors++; | 796 | stats->tx_errors++; |
804 | dev_kfree_skb(skb); | 797 | dev_kfree_skb(skb); |
805 | tunnel->recursion--; | ||
806 | return NETDEV_TX_OK; | 798 | return NETDEV_TX_OK; |
807 | } | 799 | } |
808 | 800 | ||