UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
David Ahern 2018-12-17 15:36:11 -08:00 committed by David S. Miller
parent 6e0735d1f7
commit f5c6dfdefb
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/ipv6/ip6mr.c
View File

@ -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, 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 ipv6hdr *ipv6h;
struct vif_device *vif = &mrt->vif_table[vifi]; struct vif_device *vif = &mrt->vif_table[vifi];
@ -2134,15 +2134,14 @@ forward:
if (psend != -1) { if (psend != -1) {
struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC); struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
if (skb2) if (skb2)
ip6mr_forward2(net, mrt, skb2, ip6mr_forward2(net, mrt, skb2, psend);
c, psend);
} }
psend = ct; psend = ct;
} }
} }
last_forward: last_forward:
if (psend != -1) { if (psend != -1) {
ip6mr_forward2(net, mrt, skb, c, psend); ip6mr_forward2(net, mrt, skb, psend);
return; return;
} }