[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <51ED9A7A.1010008@6wind.com>
Date: Mon, 22 Jul 2013 22:47:54 +0200
From: Nicolas Dichtel <nicolas.dichtel@...nd.com>
To: Rami Rosen <ramirose@...il.com>
CC: davem@...emloft.net, yoshfuji@...ux-ipv6.org,
netdev@...r.kernel.org
Subject: Re: [PATCH net-next] ip6mr: change the prototype of ip6_mr_forward().
Le 21/07/2013 02:00, Rami Rosen a écrit :
> 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: Rami Rosen <ramirose@...il.com>
Acked-by: Nicolas Dichtel <nicolas.dichtel@...nd.com>
> ---
> net/ipv6/ip6mr.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
> index 583e8d4..6d78615 100644
> --- a/net/ipv6/ip6mr.c
> +++ b/net/ipv6/ip6mr.c
> @@ -110,8 +110,8 @@ 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,
> - struct sk_buff *skb, struct mfc6_cache *cache);
> +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);
> static int __ip6mr_fill_mroute(struct mr6_table *mrt, struct sk_buff *skb,
> @@ -2069,8 +2069,8 @@ 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,
> - struct sk_buff *skb, struct mfc6_cache *cache)
> +static void ip6_mr_forward(struct net *net, struct mr6_table *mrt,
> + struct sk_buff *skb, struct mfc6_cache *cache)
> {
> int psend = -1;
> int vif, ct;
> @@ -2151,12 +2151,11 @@ forward:
> last_forward:
> if (psend != -1) {
> ip6mr_forward2(net, mrt, skb, cache, psend);
> - return 0;
> + return;
> }
>
> dont_forward:
> kfree_skb(skb);
> - return 0;
> }
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists