Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=226b0b4a51d1cc09928e569b121ca0abe2839169
Commit:     226b0b4a51d1cc09928e569b121ca0abe2839169
Parent:     1bad118a330d494b23663fce94d4e9d9d5065fa7
Author:     Denis V. Lunev <[EMAIL PROTECTED]>
AuthorDate: Thu Jan 10 03:30:24 2008 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:01:34 2008 -0800

    [NETNS]: Replace init_net with the correct context in fib_frontend.c
    
    Acked-by: Benjamin Thery <[EMAIL PROTECTED]>
    Acked-by: Daniel Lezcano <[EMAIL PROTECTED]>
    Signed-off-by: Denis V. Lunev <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/ipv4/fib_frontend.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 15909a9..82109f1 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -604,7 +604,7 @@ static int inet_rtm_newroute(struct sk_buff *skb, struct 
nlmsghdr* nlh, void *ar
        if (err < 0)
                goto errout;
 
-       tb = fib_new_table(&init_net, cfg.fc_table);
+       tb = fib_new_table(net, cfg.fc_table);
        if (tb == NULL) {
                err = -ENOBUFS;
                goto errout;
@@ -794,7 +794,7 @@ static void fib_del_ifaddr(struct in_ifaddr *ifa)
                fib_magic(RTM_DELROUTE, RTN_LOCAL, ifa->ifa_local, 32, prim);
 
                /* Check, that this local address finally disappeared. */
-               if (inet_addr_type(&init_net, ifa->ifa_local) != RTN_LOCAL) {
+               if (inet_addr_type(dev->nd_net, ifa->ifa_local) != RTN_LOCAL) {
                        /* And the last, but not the least thing.
                           We must flush stray FIB entries.
 
@@ -802,7 +802,7 @@ static void fib_del_ifaddr(struct in_ifaddr *ifa)
                           for stray nexthop entries, then ignite fib_flush.
                        */
                        if (fib_sync_down(ifa->ifa_local, NULL, 0))
-                               fib_flush(&init_net);
+                               fib_flush(dev->nd_net);
                }
        }
 #undef LOCAL_OK
@@ -897,7 +897,7 @@ static void nl_fib_lookup_exit(struct net *net)
 static void fib_disable_ip(struct net_device *dev, int force)
 {
        if (fib_sync_down(0, dev, force))
-               fib_flush(&init_net);
+               fib_flush(dev->nd_net);
        rt_cache_flush(0);
        arp_ifdown(dev);
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to