OSDN Git Service

ip_vti: remove the useless err_count check in vti_xmit
authorXin Long <lucien.xin@gmail.com>
Sat, 28 Oct 2017 11:46:21 +0000 (19:46 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 1 Nov 2017 02:57:32 +0000 (11:57 +0900)
Unlike ipip and gre, ip_vti never uses err_count in vti4_err,
so no need to check err_count in vti_xmit, it's value always 0.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_vti.c

index 58465c0..949f432 100644 (file)
@@ -198,15 +198,6 @@ static netdev_tx_t vti_xmit(struct sk_buff *skb, struct net_device *dev,
                goto tx_error;
        }
 
-       if (tunnel->err_count > 0) {
-               if (time_before(jiffies,
-                               tunnel->err_time + IPTUNNEL_ERR_TIMEO)) {
-                       tunnel->err_count--;
-                       dst_link_failure(skb);
-               } else
-                       tunnel->err_count = 0;
-       }
-
        mtu = dst_mtu(dst);
        if (skb->len > mtu) {
                skb_dst(skb)->ops->update_pmtu(skb_dst(skb), NULL, skb, mtu);