Commit d456336d authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by David S. Miller

net: remove 1 always zero parameter from ip6_redirect_no_header()

(the parameter in question is mark)
Signed-off-by: default avatarMaciej Żenczykowski <maze@google.com>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0b26fb17
...@@ -165,8 +165,7 @@ void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu, int oif, ...@@ -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_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, void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark,
kuid_t uid); kuid_t uid);
void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif, void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif);
u32 mark);
void ip6_sk_redirect(struct sk_buff *skb, struct sock *sk); void ip6_sk_redirect(struct sk_buff *skb, struct sock *sk);
struct netlink_callback; struct netlink_callback;
......
...@@ -1533,7 +1533,7 @@ static void ndisc_redirect_rcv(struct sk_buff *skb) ...@@ -1533,7 +1533,7 @@ static void ndisc_redirect_rcv(struct sk_buff *skb)
if (!ndopts.nd_opts_rh) { if (!ndopts.nd_opts_rh) {
ip6_redirect_no_header(skb, dev_net(skb->dev), ip6_redirect_no_header(skb, dev_net(skb->dev),
skb->dev->ifindex, 0); skb->dev->ifindex);
return; return;
} }
......
...@@ -2524,8 +2524,7 @@ void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark, ...@@ -2524,8 +2524,7 @@ void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark,
} }
EXPORT_SYMBOL_GPL(ip6_redirect); EXPORT_SYMBOL_GPL(ip6_redirect);
void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif, void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif)
u32 mark)
{ {
const struct ipv6hdr *iph = ipv6_hdr(skb); const struct ipv6hdr *iph = ipv6_hdr(skb);
const struct rd_msg *msg = (struct rd_msg *)icmp6_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, ...@@ -2533,7 +2532,6 @@ void ip6_redirect_no_header(struct sk_buff *skb, struct net *net, int oif,
struct flowi6 fl6 = { struct flowi6 fl6 = {
.flowi6_iif = LOOPBACK_IFINDEX, .flowi6_iif = LOOPBACK_IFINDEX,
.flowi6_oif = oif, .flowi6_oif = oif,
.flowi6_mark = mark,
.daddr = msg->dest, .daddr = msg->dest,
.saddr = iph->daddr, .saddr = iph->daddr,
.flowi6_uid = sock_net_uid(net, NULL), .flowi6_uid = sock_net_uid(net, NULL),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment