| Message ID | 1372962275-29138-1-git-send-email-ramirose@gmail.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
Le 04/07/2013 20:24, Rami Rosen a écrit : > This patch changes the prototpye of the ip_mr_forward() method to return void > instead of int. > > The ip_mr_forward() method always returns 0; moreover, the retun value > of this method is not checked anywhere. > > Signed-off-by: Rami Rosen <ramirose@gmail.com> > --- > net/ipv4/ipmr.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c > index 132a096..eca2742 100644 > --- a/net/ipv4/ipmr.c > +++ b/net/ipv4/ipmr.c > @@ -127,7 +127,7 @@ static struct kmem_cache *mrt_cachep __read_mostly; > static struct mr_table *ipmr_new_table(struct net *net, u32 id); > static void ipmr_free_table(struct mr_table *mrt); > > -static int ip_mr_forward(struct net *net, struct mr_table *mrt, > +static void ip_mr_forward(struct net *net, struct mr_table *mrt, > struct sk_buff *skb, struct mfc_cache *cache, > int local); > static int ipmr_cache_report(struct mr_table *mrt, > @@ -1795,7 +1795,7 @@ static int ipmr_find_vif(struct mr_table *mrt, struct net_device *dev) > > /* "local" means that we should preserve one skb (for local delivery) */ > > -static int ip_mr_forward(struct net *net, struct mr_table *mrt, > +static void ip_mr_forward(struct net *net, struct mr_table *mrt, > struct sk_buff *skb, struct mfc_cache *cache, > int local) > { > @@ -1903,14 +1903,14 @@ last_forward: > ipmr_queue_xmit(net, mrt, skb2, cache, psend); > } else { > ipmr_queue_xmit(net, mrt, skb, cache, psend); > - return 0; > + return; > } > } > > dont_forward: > if (!local) > kfree_skb(skb); > - return 0; > + return; This is the end of the function, you can just remove this 'return'. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 132a096..eca2742 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -127,7 +127,7 @@ static struct kmem_cache *mrt_cachep __read_mostly; static struct mr_table *ipmr_new_table(struct net *net, u32 id); static void ipmr_free_table(struct mr_table *mrt); -static int ip_mr_forward(struct net *net, struct mr_table *mrt, +static void ip_mr_forward(struct net *net, struct mr_table *mrt, struct sk_buff *skb, struct mfc_cache *cache, int local); static int ipmr_cache_report(struct mr_table *mrt, @@ -1795,7 +1795,7 @@ static int ipmr_find_vif(struct mr_table *mrt, struct net_device *dev) /* "local" means that we should preserve one skb (for local delivery) */ -static int ip_mr_forward(struct net *net, struct mr_table *mrt, +static void ip_mr_forward(struct net *net, struct mr_table *mrt, struct sk_buff *skb, struct mfc_cache *cache, int local) { @@ -1903,14 +1903,14 @@ last_forward: ipmr_queue_xmit(net, mrt, skb2, cache, psend); } else { ipmr_queue_xmit(net, mrt, skb, cache, psend); - return 0; + return; } } dont_forward: if (!local) kfree_skb(skb); - return 0; + return; } static struct mr_table *ipmr_rt_fib_lookup(struct net *net, struct sk_buff *skb)
This patch changes the prototpye of the ip_mr_forward() method to return void instead of int. The ip_mr_forward() method always returns 0; moreover, the retun value of this method is not checked anywhere. Signed-off-by: Rami Rosen <ramirose@gmail.com> --- net/ipv4/ipmr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)