Skip to contentSkip to conversation

ipmr: change the prototype of ip_mr_forward().

PATCH Applied Rami Rosen 3 participants 4 messages Jul 20, 2013 – Jul 24, 2013

Subsystems (3)
Networking Network drivers IPv4/IPv6
lore
Share & tools
lore

Rami Rosen

author
#0 lore raw

PATCH v3 1/1 ipmr: change the prototype of ip_mr_forward().

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 <[email protected]>
---
 net/ipv4/ipmr.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
net/ipv4/ipmr.c +7 -8
index 132a096..bacc0bc 100644
@@ -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)
Signature · 1 line
1.8.1.4
Acked-by on v3 1/1
#1 lore raw
Quoted 7 lines · Rami Rosen

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 <[email protected]>
Acked-by Nicolas Dichtel <[email protected]>
Quoted 51 lines
---
  net/ipv4/ipmr.c | 15 +++++++--------
  1 file changed, 7 insertions(+), 8 deletions(-)
net/ipv4/ipmr.c +7 -8
index 132a096..bacc0bc 100644
@@ -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)
Signature · 14 lines
Nicolas DICHTEL
6WIND
R&D Engineer

Tel: +33 1 39 30 92 41
Fax: +33 1 39 30 92 11
[email protected]
www.6wind.com
www.6windblog.com
Twitter: http://twitter.com/6windsoftware

Ce courriel ainsi que toutes les pièces jointes, est uniquement destiné à son ou ses destinataires. Il contient des informations confidentielles qui sont la propriété de 6WIND. Toute révélation, distribution ou copie des informations qu'il contient est strictement interdite. Si vous avez reçu ce message par erreur, veuillez immédiatement le signaler à l'émetteur et détruire toutes les données reçues.

This e-mail message, including any attachments, is for the sole use of the intended recipient(s) and contains information that is confidential and proprietary to 6WIND. All unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies of the original message.
#2 lore raw

Sorry for the disclaimer in the previous email. I forget to remove it. Please, ignore it.

Thank you,
Nicolas

Quoted 64 lines · Nicolas Dichtel
Quoted 7 lines · Rami Rosen

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 <[email protected]>
Acked-by Nicolas Dichtel <[email protected]>
Quoted 53 lines
---
  net/ipv4/ipmr.c | 15 +++++++--------
  1 file changed, 7 insertions(+), 8 deletions(-)
net/ipv4/ipmr.c +6 -6
index 132a096..bacc0bc 100644
@@ -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;
net/ipv4/ipmr.c +1 -2
@@ -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)