diff options
| author |   David Ahern <dsahern@gmail.com> | 2018-12-17 15:34:48 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-12-17 23:31:14 -0800 |
| commit | 6e0735d1f7e573da0976d8b7447a82b09d8ec949 (patch) | |
| tree | 103ac1cb0a3a9dca7d3c56802130b3949cc473a3 /net/ipv4/ipmr.c | |
| parent | net: dccp: initialize (addr,port) listening hashtable (diff) | |
| download | linux-dev-6e0735d1f7e573da0976d8b7447a82b09d8ec949.tar.xz linux-dev-6e0735d1f7e573da0976d8b7447a82b09d8ec949.zip | |
ipmr: Drop mfc_cache argument to ipmr_queue_xmit
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>
Diffstat (limited to 'net/ipv4/ipmr.c')
| -rw-r--r-- | net/ipv4/ipmr.c | 9 |
1 files 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 @@ 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; } } |