From: Xin Long Date: Sat, 28 Oct 2017 11:46:21 +0000 (+0800) Subject: ip_vti: remove the useless err_count check in vti_xmit X-Git-Tag: v5.15~9988^2~223 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db32919005d81a375093936a1f625f2d08c2d299;p=platform%2Fkernel%2Flinux-starfive.git ip_vti: remove the useless err_count check in vti_xmit 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 Signed-off-by: David S. Miller --- diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index 58465c0..949f432 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -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);