Commit d456336d authored Sep 29, 2018 by Maciej Żenczykowski Committed by David S. Miller Oct 02, 2018

net: remove 1 always zero parameter from ip6_redirect_no_header()



(the parameter in question is mark)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 0b26fb17

include/net/ip6_route.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -165,8 +165,7 @@ void ip6_update_pmtu(struct sk_buff skb, struct net net, __be32 mtu, int oif,
		void ip6_sk_update_pmtu(struct sk_buff skb, struct sock sk, __be32 mtu);
		void ip6_redirect(struct sk_buff skb, struct net net, int oif, u32 mark,
		kuid_t uid);
		void ip6_redirect_no_header(struct sk_buff skb, struct net net, int oif,
		u32 mark);
		void ip6_redirect_no_header(struct sk_buff skb, struct net net, int oif);
		void ip6_sk_redirect(struct sk_buff skb, struct sock sk);

		struct netlink_callback;

net/ipv6/ndisc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1533,7 +1533,7 @@ static void ndisc_redirect_rcv(struct sk_buff *skb)

		if (!ndopts.nd_opts_rh) {
		ip6_redirect_no_header(skb, dev_net(skb->dev),
		skb->dev->ifindex, 0);
		skb->dev->ifindex);
		return;
		}

net/ipv6/route.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -2524,8 +2524,7 @@ void ip6_redirect(struct sk_buff skb, struct net net, int oif, u32 mark,
		}
		EXPORT_SYMBOL_GPL(ip6_redirect);

		void ip6_redirect_no_header(struct sk_buff skb, struct net net, int oif,
		u32 mark)
		void ip6_redirect_no_header(struct sk_buff skb, struct net net, int oif)
		{
		const struct ipv6hdr *iph = ipv6_hdr(skb);
		const struct rd_msg msg = (struct rd_msg )icmp6_hdr(skb);
		@@ -2533,7 +2532,6 @@ void ip6_redirect_no_header(struct sk_buff skb, struct net net, int oif,
		struct flowi6 fl6 = {
		.flowi6_iif = LOOPBACK_IFINDEX,
		.flowi6_oif = oif,
		.flowi6_mark = mark,
		.daddr = msg->dest,
		.saddr = iph->daddr,
		.flowi6_uid = sock_net_uid(net, NULL),