From: Xu Wang <vulab@iscas.ac.cn>
Date: Mon, 13 Jan 2020 09:00:36 +0000 (+0000)
Subject: xfrm: interface: do not confirm neighbor when do pmtu update
X-Git-Tag: android-x86-9.0-r1~1^2~61^2~18
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=33bafd311856abf36e3521fe4c02317fbe5c8613;p=android-x86%2Fkernel.git

xfrm: interface: do not confirm neighbor when do pmtu update

[ Upstream commit 8aaea2b0428b6aad7c7e22d3fddc31a78bb1d724 ]

When do IPv6 tunnel PMTU update and calls __ip6_rt_update_pmtu() in the end,
we should not call dst_confirm_neigh() as there is no two-way communication.

Signed-off-by: Xu Wang <vulab@iscas.ac.cn>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c
index 20565a474211..317fe9c92932 100644
--- a/net/xfrm/xfrm_interface.c
+++ b/net/xfrm/xfrm_interface.c
@@ -294,7 +294,7 @@ xfrmi_xmit2(struct sk_buff *skb, struct net_device *dev, struct flowi *fl)
 
 	mtu = dst_mtu(dst);
 	if (!skb->ignore_df && skb->len > mtu) {
-		skb_dst_update_pmtu(skb, mtu);
+		skb_dst_update_pmtu_no_confirm(skb, mtu);
 
 		if (skb->protocol == htons(ETH_P_IPV6)) {
 			if (mtu < IPV6_MIN_MTU)