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

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

ip6mr: Drop mfc6_cache argument to ip6mr_forward2 



mfc6_cache is not needed by ip6mr_forward2 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 6e0735d1

net/ipv6/ip6mr.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -1968,7 +1968,7 @@ static inline int ip6mr_forward2_finish(struct net *net, struct sock *sk, struct 
 */

 */





static int ip6mr_forward2(struct net *net, struct mr_table *mrt,

static int ip6mr_forward2(struct net *net, struct mr_table *mrt,

			  struct sk_buff *skb, struct mfc6_cache *c, int vifi)

			  struct sk_buff *skb, int vifi)

{

{

	struct ipv6hdr *ipv6h;

	struct ipv6hdr *ipv6h;

	struct vif_device *vif = &mrt->vif_table[vifi];

	struct vif_device *vif = &mrt->vif_table[vifi];
@@ -2134,15 +2134,14 @@ static void ip6_mr_forward(struct net *net, struct mr_table *mrt, 
			if (psend != -1) {

			if (psend != -1) {

				struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);

				struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);

				if (skb2)

				if (skb2)

					ip6mr_forward2(net, mrt, skb2,

					ip6mr_forward2(net, mrt, skb2, psend);

						       c, psend);

			}

			}

			psend = ct;

			psend = ct;

		}

		}

	}

	}

last_forward:

last_forward:

	if (psend != -1) {

	if (psend != -1) {

		ip6mr_forward2(net, mrt, skb, c, psend);

		ip6mr_forward2(net, mrt, skb, psend);

		return;

		return;

	}

	}