]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
ip6mr: Drop mfc6_cache argument to ip6mr_forward2
authorDavid Ahern <dsahern@gmail.com>
Mon, 17 Dec 2018 23:36:11 +0000 (15:36 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 18 Dec 2018 07:31:14 +0000 (23:31 -0800)
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>
net/ipv6/ip6mr.c

index 8c63494400c434f047a9d8f593294e49bbae1610..34b8a90e6be2704154da2fd17a5e3ea1aefbe97f 100644 (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,
-                         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;
        }