* [PATCH v2 net-next] ipmr: change the prototype of ip_mr_forward().
@ 2013-07-04 22:15 Rami Rosen
2013-07-04 19:49 ` Daniel Borkmann
2013-07-04 21:27 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Rami Rosen @ 2013-07-04 22:15 UTC (permalink / raw)
To: davem; +Cc: netdev, nicolas.dichtel, 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 retun value of this
method is not checked anywhere.
Signed-off-by: Rami Rosen <ramirose@gmail.com>
---
net/ipv4/ipmr.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 132a096..83030bf 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,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)
--
1.8.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2 net-next] ipmr: change the prototype of ip_mr_forward().
2013-07-04 22:15 [PATCH v2 net-next] ipmr: change the prototype of ip_mr_forward() Rami Rosen
@ 2013-07-04 19:49 ` Daniel Borkmann
2013-07-04 21:27 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Borkmann @ 2013-07-04 19:49 UTC (permalink / raw)
To: Rami Rosen; +Cc: davem, netdev, nicolas.dichtel
On 07/05/2013 12:15 AM, Rami Rosen wrote:
> 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-next is currently closed. Please resend this when it opens again (announced
on netdev).
> ---
> net/ipv4/ipmr.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
> index 132a096..83030bf 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);
If you change this here, please also take care of the remaining indent,
which is always aligned at the same column of the opening '(', e.g.:
static void bla(int foo, ...,
int bar, ...);
Meaning yours needs to be one more space to the right.
> 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,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)
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2 net-next] ipmr: change the prototype of ip_mr_forward().
2013-07-04 22:15 [PATCH v2 net-next] ipmr: change the prototype of ip_mr_forward() Rami Rosen
2013-07-04 19:49 ` Daniel Borkmann
@ 2013-07-04 21:27 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2013-07-04 21:27 UTC (permalink / raw)
To: ramirose; +Cc: netdev, nicolas.dichtel
From: Rami Rosen <ramirose@gmail.com>
Date: Fri, 5 Jul 2013 01:15:55 +0300
> @@ -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,
When you change the column that the openning parenthesis of a function
declaration appears at, you must reindent all of the subsequent lines
of the declaration such that the first character lines up with the first
column after the openning parenthesis.
> @@ -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)
Likewise.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-04 21:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-04 22:15 [PATCH v2 net-next] ipmr: change the prototype of ip_mr_forward() Rami Rosen
2013-07-04 19:49 ` Daniel Borkmann
2013-07-04 21:27 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).