diff options
| author |   David Ahern <dsahern@gmail.com> | 2018-12-17 15:36:11 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-12-17 23:31:14 -0800 |
| commit | f5c6dfdefb21708aa0f382c1dc36d4e82c6c3ed5 (patch) | |
| tree | 22a3480a54b0050727e57336ce5014b98373880c /net/ipv6/ip6mr.c | |
| parent | ipmr: Drop mfc_cache argument to ipmr_queue_xmit (diff) | |
| download | linux-dev-f5c6dfdefb21708aa0f382c1dc36d4e82c6c3ed5.tar.xz linux-dev-f5c6dfdefb21708aa0f382c1dc36d4e82c6c3ed5.zip | |
ip6mr: Drop mfc6_cache argument to ip6mr_forward2
mfc6_cache is not needed by ip6mr_forward2 so drop it from the input
argument list.
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6mr.c')
| -rw-r--r-- | net/ipv6/ip6mr.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 8c63494400c4..34b8a90e6be2 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -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]; @@ -2134,15 +2134,14 @@ forward: 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; } |