netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next] ip_vti: remove the useless err_count check in vti_xmit
@ 2017-10-28 11:46 Xin Long
  2017-11-01  2:57 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Xin Long @ 2017-10-28 11:46 UTC (permalink / raw)
  To: network dev; +Cc: davem, Saurabh

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>
---
 net/ipv4/ip_vti.c | 9 ---------
 1 file changed, 9 deletions(-)

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);
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH net-next] ip_vti: remove the useless err_count check in vti_xmit
  2017-10-28 11:46 [PATCH net-next] ip_vti: remove the useless err_count check in vti_xmit Xin Long
@ 2017-11-01  2:57 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-11-01  2:57 UTC (permalink / raw)
  To: lucien.xin; +Cc: netdev, saurabh.mohan

From: Xin Long <lucien.xin@gmail.com>
Date: Sat, 28 Oct 2017 19:46:21 +0800

> 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>

Applied.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-11-01  2:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-28 11:46 [PATCH net-next] ip_vti: remove the useless err_count check in vti_xmit Xin Long
2017-11-01  2:57 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).