diff options
| author |   Xin Long <lucien.xin@gmail.com> | 2017-10-28 19:46:21 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-11-01 11:57:32 +0900 |
| commit | db32919005d81a375093936a1f625f2d08c2d299 (patch) | |
| tree | 3371e32e4ba10636ee138401da11e182424593dd /net/ipv4/ip_vti.c | |
| parent | net: bcmgenet: Avoid calling platform_device_put() twice in bcmgenet_mii_exit() (diff) | |
| download | linux-dev-db32919005d81a375093936a1f625f2d08c2d299.tar.xz linux-dev-db32919005d81a375093936a1f625f2d08c2d299.zip | |
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 <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_vti.c')
| -rw-r--r-- | net/ipv4/ip_vti.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index 58465c0a8682..949f432a5f04 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); |