Commit 6e0735d1 authored by David Ahern's avatar David Ahern Committed by David S. Miller

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: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eedbbb0d
...@@ -1820,8 +1820,7 @@ static bool ipmr_forward_offloaded(struct sk_buff *skb, struct mr_table *mrt, ...@@ -1820,8 +1820,7 @@ static bool ipmr_forward_offloaded(struct sk_buff *skb, struct mr_table *mrt,
/* Processing handlers for ipmr_forward */ /* Processing handlers for ipmr_forward */
static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt, static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt,
int in_vifi, struct sk_buff *skb, int in_vifi, struct sk_buff *skb, int vifi)
struct mfc_cache *c, int vifi)
{ {
const struct iphdr *iph = ip_hdr(skb); const struct iphdr *iph = ip_hdr(skb);
struct vif_device *vif = &mrt->vif_table[vifi]; struct vif_device *vif = &mrt->vif_table[vifi];
...@@ -2027,7 +2026,7 @@ static void ip_mr_forward(struct net *net, struct mr_table *mrt, ...@@ -2027,7 +2026,7 @@ static void ip_mr_forward(struct net *net, struct mr_table *mrt,
if (skb2) if (skb2)
ipmr_queue_xmit(net, mrt, true_vifi, ipmr_queue_xmit(net, mrt, true_vifi,
skb2, c, psend); skb2, psend);
} }
psend = ct; psend = ct;
} }
...@@ -2039,9 +2038,9 @@ static void ip_mr_forward(struct net *net, struct mr_table *mrt, ...@@ -2039,9 +2038,9 @@ static void ip_mr_forward(struct net *net, struct mr_table *mrt,
if (skb2) if (skb2)
ipmr_queue_xmit(net, mrt, true_vifi, skb2, ipmr_queue_xmit(net, mrt, true_vifi, skb2,
c, psend); psend);
} else { } else {
ipmr_queue_xmit(net, mrt, true_vifi, skb, c, psend); ipmr_queue_xmit(net, mrt, true_vifi, skb, psend);
return; return;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment