Skip to content

Commit

Permalink
ip6mr: Drop mfc6_cache argument to ip6mr_forward2
Browse files Browse the repository at this point in the history
mfc6_cache is not needed by ip6mr_forward2 so drop it from the input
argument list.

Signed-off-by: David Ahern <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
dsahern authored and davem330 committed Dec 18, 2018
1 parent 6e0735d commit f5c6dfd
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions net/ipv6/ip6mr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1968,7 +1968,7 @@ static inline int ip6mr_forward2_finish(struct net *net, struct sock *sk, struct
*/

static int ip6mr_forward2(struct net *net, struct mr_table *mrt,
struct sk_buff *skb, struct mfc6_cache *c, int vifi)
struct sk_buff *skb, int vifi)
{
struct ipv6hdr *ipv6h;
struct vif_device *vif = &mrt->vif_table[vifi];
Expand Down Expand Up @@ -2134,15 +2134,14 @@ static void ip6_mr_forward(struct net *net, struct mr_table *mrt,
if (psend != -1) {
struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
if (skb2)
ip6mr_forward2(net, mrt, skb2,
c, psend);
ip6mr_forward2(net, mrt, skb2, psend);
}
psend = ct;
}
}
last_forward:
if (psend != -1) {
ip6mr_forward2(net, mrt, skb, c, psend);
ip6mr_forward2(net, mrt, skb, psend);
return;
}

Expand Down

0 comments on commit f5c6dfd

Please sign in to comment.