Added net namespace parameter to fib4_rules_init when statically
defined in fib_frontend.c

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
 net/ipv4/fib_frontend.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6-netns/net/ipv4/fib_frontend.c
===================================================================
--- linux-2.6-netns.orig/net/ipv4/fib_frontend.c
+++ linux-2.6-netns/net/ipv4/fib_frontend.c
@@ -59,7 +59,7 @@ struct fib_table *ip_fib_main_table;
 #define FIB_TABLE_HASHSZ 1
 static struct hlist_head fib_table_hash[FIB_TABLE_HASHSZ];
 
-static void __init fib4_rules_init(void)
+static void __init fib4_rules_init(struct net *net)
 {
 	ip_fib_local_table = fib_hash_init(RT_TABLE_LOCAL);
 	hlist_add_head_rcu(&ip_fib_local_table->tb_hlist, &fib_table_hash[0]);

-- 
_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers

applied... though I am not too familiar with git and the author has been
set to me rather than you with your signed-off :(

Sorry,
	Den

dlezcano@fr.ibm.com wrote:
> Added net namespace parameter to fib4_rules_init when statically
> defined in fib_frontend.c
> 
> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
> ---
>  net/ipv4/fib_frontend.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: linux-2.6-netns/net/ipv4/fib_frontend.c
> ===================================================================
> --- linux-2.6-netns.orig/net/ipv4/fib_frontend.c
> +++ linux-2.6-netns/net/ipv4/fib_frontend.c
> @@ -59,7 +59,7 @@ struct fib_table *ip_fib_main_table;
>  #define FIB_TABLE_HASHSZ 1
>  static struct hlist_head fib_table_hash[FIB_TABLE_HASHSZ];
>  
> -static void __init fib4_rules_init(void)
> +static void __init fib4_rules_init(struct net *net)
>  {
>  	ip_fib_local_table = fib_hash_init(RT_TABLE_LOCAL);
>  	hlist_add_head_rcu(&ip_fib_local_table->tb_hlist, &fib_table_hash[0]);
> 

_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers

Denis V. Lunev wrote:
> applied... though I am not too familiar with git and the author has been
> set to me rather than you with your signed-off :(

It's ok :)

I think you should specify the --author option when commiting.

By the way, I see that there are some patches without your Signed-off 
and you are in the delivery path, shouldn't you Signed-off all the patches ?
_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers

Daniel Lezcano <dlezcano@fr.ibm.com> writes:

> Denis V. Lunev wrote:
>> applied... though I am not too familiar with git and the author has been
>> set to me rather than you with your signed-off :(
>
> It's ok :)
>
> I think you should specify the --author option when commiting.

My normal technique here is to simply save the entire email message
and then do git-am email.txt and git picks it all up from the
headers.

Eric

_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers

apparently, the patch is not enough, fib4_rules_init is called from
non-init function. I'll drop this one during port to 2.6.25 tree

dlezcano@fr.ibm.com wrote:
> Added net namespace parameter to fib4_rules_init when statically
> defined in fib_frontend.c
> 
> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
> ---
>  net/ipv4/fib_frontend.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: linux-2.6-netns/net/ipv4/fib_frontend.c
> ===================================================================
> --- linux-2.6-netns.orig/net/ipv4/fib_frontend.c
> +++ linux-2.6-netns/net/ipv4/fib_frontend.c
> @@ -59,7 +59,7 @@ struct fib_table *ip_fib_main_table;
>  #define FIB_TABLE_HASHSZ 1
>  static struct hlist_head fib_table_hash[FIB_TABLE_HASHSZ];
>  
> -static void __init fib4_rules_init(void)
> +static void __init fib4_rules_init(struct net *net)
>  {
>  	ip_fib_local_table = fib_hash_init(RT_TABLE_LOCAL);
>  	hlist_add_head_rcu(&ip_fib_local_table->tb_hlist, &fib_table_hash[0]);
> 

_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers