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

Commit 2b52c3ad authored by Rami Rosen's avatar Rami Rosen Committed by David S. Miller
Browse files

ip6mr: change the prototype of ip6_mr_forward(). 



This patch changes the prototpye of the ip6_mr_forward() method to return void
instead of int.

The ip6_mr_forward() method always returns 0; moreover, the return value of this
method is not checked anywhere.

Signed-off-by: default avatarRami Rosen <ramirose@gmail.com>
Acked-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c4854ec8

net/ipv6/ip6mr.c

+5 −6
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static struct kmem_cache *mrt_cachep __read_mostly; 
static struct mr6_table *ip6mr_new_table(struct net *net, u32 id);

static void ip6mr_free_table(struct mr6_table *mrt);



static int ip6_mr_forward(struct net *net, struct mr6_table *mrt,

static void ip6_mr_forward(struct net *net, struct mr6_table *mrt,

			   struct sk_buff *skb, struct mfc6_cache *cache);

static int ip6mr_cache_report(struct mr6_table *mrt, struct sk_buff *pkt,

			      mifi_t mifi, int assert);
@@ -2069,7 +2069,7 @@ static int ip6mr_find_vif(struct mr6_table *mrt, struct net_device *dev) 
	return ct;

}



static int ip6_mr_forward(struct net *net, struct mr6_table *mrt,

static void ip6_mr_forward(struct net *net, struct mr6_table *mrt,

			   struct sk_buff *skb, struct mfc6_cache *cache)

{

	int psend = -1;
@@ -2151,12 +2151,11 @@ static int ip6_mr_forward(struct net *net, struct mr6_table *mrt, 
last_forward:

	if (psend != -1) {

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

		return 0;

		return;

	}



dont_forward:

	kfree_skb(skb);

	return 0;

}