From: David Ahern <dsah...@gmail.com>

mfc6_cache is not needed by ip6mr_forward2 so drop it from the input
argument list.

Signed-off-by: David Ahern <dsah...@gmail.com>
---
 net/ipv6/ip6mr.c | 7 +++----
 1 file 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 @@ 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;
        }
 
-- 
2.11.0

Reply via email to