net-ipv4: remove 2 always zero parameters from ipv4_update_pmtu()
Subsystems (6)
PATCH 1/2 net-ipv4: remove 2 always zero parameters from ipv4_update_pmtu()
From: Maciej Żenczykowski <[email protected]>
Signed-off-by Maciej Żenczykowski <[email protected]>
--- include/net/route.h | 2 +- net/ipv4/ah4.c | 2 +- net/ipv4/esp4.c | 2 +- net/ipv4/icmp.c | 2 +- net/ipv4/ip_gre.c | 2 +- net/ipv4/ip_vti.c | 2 +- net/ipv4/ipcomp.c | 2 +- net/ipv4/ipip.c | 3 +-- net/ipv4/route.c | 8 +++----- net/ipv6/sit.c | 2 +- net/netfilter/ipvs/ip_vs_core.c | 3 +-- net/xfrm/xfrm_interface.c | 2 +- 12 files changed, 14 insertions(+), 18 deletions(-)
include/net/route.h +1 -1
@@ -201,7 +201,7 @@ static inline int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src, }void ipv4_update_pmtu (struct sk_buff *skb,struct net *net,u32 mtu,int oif, -u32 mark,u8 protocol,int flow_flags); +u8 protocol);void ipv4_sk_update_pmtu (struct sk_buff *skb,struct sock *sk,u32 mtu);void ipv4_redirect (struct sk_buff *skb,struct net *net,int oif,u32 mark,u8 protocol,int flow_flags);
net/ipv4/ah4.c +1 -1
@@ -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);
net/ipv4/esp4.c +1 -1
@@ -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);
net/ipv4/icmp.c +1 -1
@@ -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 ); }
net/ipv4/ip_gre.c +1 -1
@@ -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 ) {
net/ipv4/ip_vti.c +1 -1
@@ -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);
net/ipv4/ipcomp.c +1 -1
@@ -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);
net/ipv4/ipip.c +1 -2
@@ -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; }
net/ipv4/route.c +3 -5
@@ -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);
net/ipv6/sit.c +1 -1
@@ -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; }
net/netfilter/ipvs/ip_vs_core.c +1 -2
@@ -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;
net/xfrm/xfrm_interface.c +1 -1
@@ -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);
Signature · 1 line
2.19.0.605.g01d371f741-goog
PATCH 2/2 net-ipv4: remove 2 always zero parameters from ipv4_redirect()
From: Maciej Żenczykowski <[email protected]>
Signed-off-by Maciej Żenczykowski <[email protected]>
--- include/net/route.h | 3 +-- net/ipv4/ah4.c | 2 +- net/ipv4/esp4.c | 2 +- net/ipv4/icmp.c | 2 +- net/ipv4/ip_gre.c | 4 ++-- net/ipv4/ip_vti.c | 2 +- net/ipv4/ipcomp.c | 2 +- net/ipv4/ipip.c | 2 +- net/ipv4/route.c | 4 ++-- net/ipv6/sit.c | 4 ++-- net/xfrm/xfrm_interface.c | 2 +- 11 files changed, 14 insertions(+), 15 deletions(-)
include/net/route.h +1 -2
@@ -203,8 +203,7 @@ static inline int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src,void ipv4_update_pmtu (struct sk_buff *skb,struct net *net,u32 mtu,int oif,u8 protocol);void ipv4_sk_update_pmtu (struct sk_buff *skb,struct sock *sk,u32 mtu); -void ipv4_redirect (struct sk_buff *skb,struct net *net,int oif,u32 mark, -u8 protocol,int flow_flags); +void ipv4_redirect (struct sk_buff *skb,struct net *net,int oif,u8 protocol);void ipv4_sk_redirect (struct sk_buff *skb,struct sock *sk);void ip_rt_send_redirect (struct sk_buff *skb);
net/ipv4/ah4.c +1 -1
@@ -463,7 +463,7 @@ static int ah4_err(struct sk_buff *skb, u32 info)if (icmp_hdr (skb)->type ==ICMP_DEST_UNREACH )ipv4_update_pmtu (skb, net, info,0 ,IPPROTO_AH );else -ipv4_redirect (skb, net,0 ,0 ,IPPROTO_AH ,0 ); +ipv4_redirect (skb, net,0 ,IPPROTO_AH );xfrm_state_put (x);return 0 ;
net/ipv4/esp4.c +1 -1
@@ -822,7 +822,7 @@ static int esp4_err(struct sk_buff *skb, u32 info)if (icmp_hdr (skb)->type ==ICMP_DEST_UNREACH )ipv4_update_pmtu (skb, net, info,0 ,IPPROTO_ESP );else -ipv4_redirect (skb, net,0 ,0 ,IPPROTO_ESP ,0 ); +ipv4_redirect (skb, net,0 ,IPPROTO_ESP );xfrm_state_put (x);return 0 ;
net/ipv4/icmp.c +1 -1
@@ -1100,7 +1100,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 ,IPPROTO_ICMP );else if (type ==ICMP_REDIRECT ) -ipv4_redirect (skb, net,0 ,0 ,IPPROTO_ICMP ,0 ); +ipv4_redirect (skb, net,0 ,IPPROTO_ICMP ); }/*
net/ipv4/ip_gre.c +2 -2
@@ -243,8 +243,8 @@ static void gre_err(struct sk_buff *skb, u32 info)return ; }if (type ==ICMP_REDIRECT ) { -ipv4_redirect (skb,dev_net (skb->dev), skb->dev->ifindex,0 , -IPPROTO_GRE ,0 ); +ipv4_redirect (skb,dev_net (skb->dev), skb->dev->ifindex, +IPPROTO_GRE );return ; }
net/ipv4/ip_vti.c +1 -1
@@ -320,7 +320,7 @@ static int vti4_err(struct sk_buff *skb, u32 info)if (icmp_hdr (skb)->type ==ICMP_DEST_UNREACH )ipv4_update_pmtu (skb, net, info,0 , protocol);else -ipv4_redirect (skb, net,0 ,0 , protocol,0 ); +ipv4_redirect (skb, net,0 , protocol);xfrm_state_put (x);return 0 ;
net/ipv4/ipcomp.c +1 -1
@@ -50,7 +50,7 @@ static int ipcomp4_err(struct sk_buff *skb, u32 info)if (icmp_hdr (skb)->type ==ICMP_DEST_UNREACH )ipv4_update_pmtu (skb, net, info,0 ,IPPROTO_COMP );else -ipv4_redirect (skb, net,0 ,0 ,IPPROTO_COMP ,0 ); +ipv4_redirect (skb, net,0 ,IPPROTO_COMP );xfrm_state_put (x);return 0 ;
net/ipv4/ipip.c +1 -1
@@ -180,7 +180,7 @@ static int ipip_err(struct sk_buff *skb, u32 info) }if (type ==ICMP_REDIRECT ) { -ipv4_redirect (skb, net, t->parms.link,0 , iph->protocol,0 ); +ipv4_redirect (skb, net, t->parms.link, iph->protocol); goto out; }
net/ipv4/route.c +2 -2
@@ -1130,14 +1130,14 @@ void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu)EXPORT_SYMBOL_GPL (ipv4_sk_update_pmtu);void ipv4_redirect (struct sk_buff *skb,struct net *net, -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;__build_flow_key (net, &fl4,NULL , iph, oif, -RT_TOS (iph->tos), protocol, mark, flow_flags); +RT_TOS (iph->tos), protocol,0 ,0 ); rt =__ip_route_output_key (net, &fl4);if (!IS_ERR (rt)) {__ip_do_redirect (rt, skb, &fl4, false);
net/ipv6/sit.c +2 -2
@@ -539,8 +539,8 @@ static int ipip6_err(struct sk_buff *skb, u32 info) goto out; }if (type ==ICMP_REDIRECT ) { -ipv4_redirect (skb,dev_net (skb->dev), t->parms.link,0 , - iph->protocol,0 ); +ipv4_redirect (skb,dev_net (skb->dev), t->parms.link, + iph->protocol); err =0 ; goto out; }
net/xfrm/xfrm_interface.c +1 -1
@@ -471,7 +471,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 , protocol);else -ipv4_redirect (skb, net,0 ,0 , protocol,0 ); +ipv4_redirect (skb, net,0 , protocol);xfrm_state_put (x);return 0 ;
Signature · 1 line
2.19.0.605.g01d371f741-goog
Re: [PATCH 2/2] net-ipv4: remove 2 always zero parameters from ipv4_redirect()
Quoted 1 line · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
A summary here of which 2 parameters are always 0 would be nice.
Quoted 15 lines
Signed-off-by Maciej Żenczykowski <[email protected]>--- include/net/route.h | 3 +-- net/ipv4/ah4.c | 2 +- net/ipv4/esp4.c | 2 +- net/ipv4/icmp.c | 2 +- net/ipv4/ip_gre.c | 4 ++-- net/ipv4/ip_vti.c | 2 +- net/ipv4/ipcomp.c | 2 +- net/ipv4/ipip.c | 2 +- net/ipv4/route.c | 4 ++-- net/ipv6/sit.c | 4 ++-- net/xfrm/xfrm_interface.c | 2 +- 11 files changed, 14 insertions(+), 15 deletions(-)
Reviewed-by David Ahern <[email protected]>
Quoted 2 lines · Maciej Żenczykowski
From: Maciej Żenczykowski <[email protected]>
A summary here of which 2 parameters are always 0 would be nice.
Quoted 16 lines
Signed-off-by Maciej Żenczykowski <[email protected]>--- include/net/route.h | 2 +- net/ipv4/ah4.c | 2 +- net/ipv4/esp4.c | 2 +- net/ipv4/icmp.c | 2 +- net/ipv4/ip_gre.c | 2 +- net/ipv4/ip_vti.c | 2 +- net/ipv4/ipcomp.c | 2 +- net/ipv4/ipip.c | 3 +-- net/ipv4/route.c | 8 +++----- net/ipv6/sit.c | 2 +- net/netfilter/ipvs/ip_vs_core.c | 3 +-- net/xfrm/xfrm_interface.c | 2 +- 12 files changed, 14 insertions(+), 18 deletions(-)
Reviewed-by David Ahern <[email protected]>