[PATCH net-next] ipmr: Drop mfc_cache argument to ipmr_queue_xmit

[PATCH net-next] ipmr: Drop mfc_cache argument to ipmr_queue_xmit

[David Ahern]

From: David Ahern <dsahern@gmail.com>

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>
---
 net/ipv4/ipmr.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index ea04e38f56e9..75c654924532 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -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 @@ static void ip_mr_forward(struct net *net, struct mr_table *mrt,
 
 				if (skb2)
 					ipmr_queue_xmit(net, mrt, true_vifi,
-							skb2, c, psend);
+							skb2, psend);
 			}
 			psend = ct;
 		}
@@ -2039,9 +2038,9 @@ static void ip_mr_forward(struct net *net, struct mr_table *mrt,
 
 			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;
 		}
 	}
-- 
2.11.0

Re: [PATCH net-next] ipmr: Drop mfc_cache argument to ipmr_queue_xmit

[David Miller]

From: David Ahern <dsahern@kernel.org>
Date: Mon, 17 Dec 2018 15:34:48 -0800

> From: David Ahern <dsahern@gmail.com>
> 
> 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>

Applied.