blob: 406ee6c391ac1aac2a4e439240f744dc867a2fa3 [file] [log] [blame]
From af013d115b46e484056fc244e846c39055f1e0a2 Mon Sep 17 00:00:00 2001
From: Hangbin Liu <>
Date: Sun, 22 Dec 2019 10:51:15 +0800
Subject: [PATCH] sit: do not confirm neighbor when do pmtu update
commit 4d42df46d6372ece4cb4279870b46c2ea7304a47 upstream.
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.
v5: No change.
v4: No change.
v3: Do not remove dst_confirm_neigh, but add a new bool parameter in
dst_ops.update_pmtu to control whether we should do neighbor confirm.
Also split the big patch to small ones for each area.
v2: Remove dst_confirm_neigh in __ip6_rt_update_pmtu.
Reviewed-by: Guillaume Nault <>
Acked-by: David Ahern <>
Signed-off-by: Hangbin Liu <>
Signed-off-by: David S. Miller <>
Signed-off-by: Paul Gortmaker <>
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 80610899a323..91a89c662f1a 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -939,7 +939,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
if (tunnel->parms.iph.daddr)
- skb_dst_update_pmtu(skb, mtu);
+ skb_dst_update_pmtu_no_confirm(skb, mtu);
if (skb->len > mtu && !skb_is_gso(skb)) {
icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);