Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1042caa7 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by David S. Miller
Browse files

net-ipv4: remove 2 always zero parameters from ipv4_redirect() 



(the parameters in question are mark and flow_flags)

Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarMaciej Żenczykowski <maze@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d888f396

include/net/route.h

+1 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

	}