ipmr: Drop mfc_cache argument to ipmr_queue_xmit
authorDavid Ahern <dsahern@gmail.com>
Mon, 17 Dec 2018 23:34:48 +0000 (15:34 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 18 Dec 2018 07:31:14 +0000 (23:31 -0800)
mfc_cache is not needed by ipmr_queue_xmit 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/ipv4/ipmr.c

index ea04e38..75c6549 100644 (file)
@@ -1820,8 +1820,7 @@ static bool ipmr_forward_offloaded(struct sk_buff *skb, struct mr_table *mrt,
 /* Processing handlers for ipmr_forward */
 
 static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt,
-                           int in_vifi, struct sk_buff *skb,
-                           struct mfc_cache *c, int vifi)
+                           int in_vifi, struct sk_buff *skb, int vifi)
 {
        const struct iphdr *iph = ip_hdr(skb);
        struct vif_device *vif = &mrt->vif_table[vifi];
@@ -2027,7 +2026,7 @@ forward:
 
                                if (skb2)
                                        ipmr_queue_xmit(net, mrt, true_vifi,
-                                                       skb2, c, psend);
+                                                       skb2, psend);
                        }
                        psend = ct;
                }
@@ -2039,9 +2038,9 @@ last_forward:
 
                        if (skb2)
                                ipmr_queue_xmit(net, mrt, true_vifi, skb2,
-                                               c, psend);
+                                               psend);
                } else {
-                       ipmr_queue_xmit(net, mrt, true_vifi, skb, c, psend);
+                       ipmr_queue_xmit(net, mrt, true_vifi, skb, psend);
                        return;
                }
        }