11 files changed, 13 insertions, 17 deletions

diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 4dd95cdd8070..8811fe30282a 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -461,7 +461,7 @@ static int ah4_err(struct sk_buff *skb, u32 info)
                 return 0;
 
         if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH)
-                ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_AH, 0);
+                ipv4_update_pmtu(skb, net, info, 0, IPPROTO_AH);
         else
                 ipv4_redirect(skb, net, 0, 0, IPPROTO_AH, 0);
         xfrm_state_put(x);
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 97689012b357..2d0274441923 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -820,7 +820,7 @@ static int esp4_err(struct sk_buff *skb, u32 info)
                 return 0;
 
         if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH)
-                ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_ESP, 0);
+                ipv4_update_pmtu(skb, net, info, 0, IPPROTO_ESP);
         else
                 ipv4_redirect(skb, net, 0, 0, IPPROTO_ESP, 0);
         xfrm_state_put(x);
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 695979b7ef6d..8013b37b598f 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -1098,7 +1098,7 @@ void icmp_err(struct sk_buff *skb, u32 info)
         }
 
         if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED)
-                ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_ICMP, 0);
+                ipv4_update_pmtu(skb, net, info, 0, IPPROTO_ICMP);
         else if (type == ICMP_REDIRECT)
                 ipv4_redirect(skb, net, 0, 0, IPPROTO_ICMP, 0);
 }
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index c3385a84f8ff..83b80fafd8f2 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -239,7 +239,7 @@ static void gre_err(struct sk_buff *skb, u32 info)
 
         if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) {
                 ipv4_update_pmtu(skb, dev_net(skb->dev), info,
-                                 skb->dev->ifindex, 0, IPPROTO_GRE, 0);
+                                 skb->dev->ifindex, IPPROTO_GRE);
                 return;
         }
         if (type == ICMP_REDIRECT) {
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
index f38cb21d773d..1b5571cb3282 100644
--- a/net/ipv4/ip_vti.c
+++ b/net/ipv4/ip_vti.c
@@ -318,7 +318,7 @@ static int vti4_err(struct sk_buff *skb, u32 info)
                 return 0;
 
         if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH)
-                ipv4_update_pmtu(skb, net, info, 0, 0, protocol, 0);
+                ipv4_update_pmtu(skb, net, info, 0, protocol);
         else
                 ipv4_redirect(skb, net, 0, 0, protocol, 0);
         xfrm_state_put(x);
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
index d97f4f2787f5..04049d1330a2 100644
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@@ -48,7 +48,7 @@ static int ipcomp4_err(struct sk_buff *skb, u32 info)
                 return 0;
 
         if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH)
-                ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_COMP, 0);
+                ipv4_update_pmtu(skb, net, info, 0, IPPROTO_COMP);
         else
                 ipv4_redirect(skb, net, 0, 0, IPPROTO_COMP, 0);
         xfrm_state_put(x);
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index c891235b4966..6ff008e5818d 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -175,8 +175,7 @@ static int ipip_err(struct sk_buff *skb, u32 info)
         }
 
         if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) {
-                ipv4_update_pmtu(skb, net, info, t->parms.link, 0,
-                                 iph->protocol, 0);
+                ipv4_update_pmtu(skb, net, info, t->parms.link, iph->protocol);
                 goto out;
         }
 
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index b678466da451..7bbe3fc80b90 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1040,17 +1040,15 @@ static void ip_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
 }
 
 void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu,
-                      int oif, u32 mark, u8 protocol, int flow_flags)
+                      int oif, u8 protocol)
 {
         const struct iphdr *iph = (const struct iphdr *) skb->data;
         struct flowi4 fl4;
         struct rtable *rt;
-
-        if (!mark)
-                mark = IP4_REPLY_MARK(net, skb->mark);
+        u32 mark = IP4_REPLY_MARK(net, skb->mark);
 
         __build_flow_key(net, &fl4, NULL, iph, oif,
-                         RT_TOS(iph->tos), protocol, mark, flow_flags);
+                         RT_TOS(iph->tos), protocol, mark, 0);
         rt = __ip_route_output_key(net, &fl4);
         if (!IS_ERR(rt)) {
                 __ip_rt_update_pmtu(rt, &fl4, mtu);
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index e9400ffa7875..085c588ebfe0 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -534,7 +534,7 @@ static int ipip6_err(struct sk_buff *skb, u32 info)
 
         if (type == ICMP_DEST_UNREACH && code == ICMP_FRAG_NEEDED) {
                 ipv4_update_pmtu(skb, dev_net(skb->dev), info,
-                                 t->parms.link, 0, iph->protocol, 0);
+                                 t->parms.link, iph->protocol);
                 err = 0;
                 goto out;
         }
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index 7ca926a03b81..fe9abf3cc10a 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -1686,8 +1686,7 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,
                         skb_reset_network_header(skb);
                         IP_VS_DBG(12, "ICMP for IPIP %pI4->%pI4: mtu=%u\n",
                                 &ip_hdr(skb)->saddr, &ip_hdr(skb)->daddr, mtu);
-                        ipv4_update_pmtu(skb, ipvs->net,
-                                         mtu, 0, 0, 0, 0);
+                        ipv4_update_pmtu(skb, ipvs->net, mtu, 0, 0);
                         /* Client uses PMTUD? */
                         if (!(frag_off & htons(IP_DF)))
                                 goto ignore_ipip;
diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c
index 31acc6f33d98..16bc5ecb7869 100644
--- a/net/xfrm/xfrm_interface.c
+++ b/net/xfrm/xfrm_interface.c
@@ -469,7 +469,7 @@ static int xfrmi4_err(struct sk_buff *skb, u32 info)
         }
 
         if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH)
-                ipv4_update_pmtu(skb, net, info, 0, 0, protocol, 0);
+                ipv4_update_pmtu(skb, net, info, 0, protocol);
         else
                 ipv4_redirect(skb, net, 0, 0, protocol, 0);
         xfrm_state_put(x);