Skip to content

Commit

Permalink
ipmr: Drop mfc_cache argument to ipmr_queue_xmit
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Ahern authored and David S. Miller committed Dec 18, 2018
1 parent eedbbb0 commit 6e0735d
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions net/ipv4/ipmr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
}
Expand Down

0 comments on commit 6e0735d

Please sign in to comment.