Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

net/ipv4/ipmr.c

+4 −5
Original line number Diff line number Diff line
@@ -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;

		}

	}