Patchwork [v3,net-next] ipmr: change the prototype of ip_mr_forward().

login
register
mail settings
Submitter Rami Rosen
Date July 20, 2013, 12:09 p.m.
Message ID <1374322168-5115-1-git-send-email-ramirose@gmail.com>
Download mbox | patch
Permalink /patch/260425/
State Accepted
Delegated to: David Miller
Headers show

Comments

Rami Rosen - July 20, 2013, 12:09 p.m.
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 return value of this
method is not checked anywhere.

Signed-off-by: Rami Rosen <ramirose@gmail.com>
---
 net/ipv4/ipmr.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
Nicolas Dichtel - July 20, 2013, 8:21 p.m.
Le 20/07/2013 14:09, 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 return value of this
> method is not checked anywhere.
>
> Signed-off-by: Rami Rosen <ramirose@gmail.com>
Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>

> ---
>   net/ipv4/ipmr.c | 15 +++++++--------
>   1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
> index 132a096..bacc0bc 100644
> --- a/net/ipv4/ipmr.c
> +++ b/net/ipv4/ipmr.c
> @@ -127,9 +127,9 @@ 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,
> -			 struct sk_buff *skb, struct mfc_cache *cache,
> -			 int local);
> +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,
>   			     struct sk_buff *pkt, vifi_t vifi, int assert);
>   static int __ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb,
> @@ -1795,9 +1795,9 @@ 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,
> -			 struct sk_buff *skb, struct mfc_cache *cache,
> -			 int local)
> +static void ip_mr_forward(struct net *net, struct mr_table *mrt,
> +			  struct sk_buff *skb, struct mfc_cache *cache,
> +			  int local)
>   {
>   	int psend = -1;
>   	int vif, ct;
> @@ -1903,14 +1903,13 @@ 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;
>   }
>
>   static struct mr_table *ipmr_rt_fib_lookup(struct net *net, struct sk_buff *skb)
>
Nicolas Dichtel - July 20, 2013, 8:25 p.m.
Sorry for the disclaimer in the previous email. I forget to remove it.
Please, ignore it.


Thank you,
Nicolas

Le 20/07/2013 22:21, Nicolas Dichtel a écrit :
> Le 20/07/2013 14:09, 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 return value of this
>> method is not checked anywhere.
>>
>> Signed-off-by: Rami Rosen <ramirose@gmail.com>
> Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
>
>> ---
>>   net/ipv4/ipmr.c | 15 +++++++--------
>>   1 file changed, 7 insertions(+), 8 deletions(-)
>>
>> diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
>> index 132a096..bacc0bc 100644
>> --- a/net/ipv4/ipmr.c
>> +++ b/net/ipv4/ipmr.c
>> @@ -127,9 +127,9 @@ 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,
>> -             struct sk_buff *skb, struct mfc_cache *cache,
>> -             int local);
>> +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,
>>                    struct sk_buff *pkt, vifi_t vifi, int assert);
>>   static int __ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb,
>> @@ -1795,9 +1795,9 @@ 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,
>> -             struct sk_buff *skb, struct mfc_cache *cache,
>> -             int local)
>> +static void ip_mr_forward(struct net *net, struct mr_table *mrt,
>> +              struct sk_buff *skb, struct mfc_cache *cache,
>> +              int local)
>>   {
>>       int psend = -1;
>>       int vif, ct;
>> @@ -1903,14 +1903,13 @@ 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;
>>   }
>>
>>   static struct mr_table *ipmr_rt_fib_lookup(struct net *net, struct sk_buff
>> *skb)
>>
>
--
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
David Miller - July 24, 2013, 12:01 a.m.
From: Rami Rosen <ramirose@gmail.com>
Date: Sat, 20 Jul 2013 15:09:28 +0300

> 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 return value of this
> method is not checked anywhere.
> 
> Signed-off-by: Rami Rosen <ramirose@gmail.com>

Applied, thanks.
--
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

Patch

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 132a096..bacc0bc 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -127,9 +127,9 @@  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,
-			 struct sk_buff *skb, struct mfc_cache *cache,
-			 int local);
+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,
 			     struct sk_buff *pkt, vifi_t vifi, int assert);
 static int __ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb,
@@ -1795,9 +1795,9 @@  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,
-			 struct sk_buff *skb, struct mfc_cache *cache,
-			 int local)
+static void ip_mr_forward(struct net *net, struct mr_table *mrt,
+			  struct sk_buff *skb, struct mfc_cache *cache,
+			  int local)
 {
 	int psend = -1;
 	int vif, ct;
@@ -1903,14 +1903,13 @@  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;
 }
 
 static struct mr_table *ipmr_rt_fib_lookup(struct net *net, struct sk_buff *skb)