[NETNS]: Add netns to nl_info structure.

nl_info is used to track the end-user destination of routing change
notification. This is a natural object to hold a namespace on. Place
it there and utilize the context in the appropriate places.

Acked-by: Benjamin Thery <benjamin.thery@bull.net>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 0 deletions

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index d1a45cb6f6b0..90aa05f47f8e 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -310,6 +310,7 @@ static int rtentry_to_fib_config(int cmd, struct rtentry *rt,
         int plen;
 
         memset(cfg, 0, sizeof(*cfg));
+        cfg->fc_nlinfo.nl_net = &init_net;
 
         if (rt->rt_dst.sa_family != AF_INET)
                 return -EAFNOSUPPORT;
@@ -516,6 +517,7 @@ static int rtm_to_fib_config(struct sk_buff *skb, struct nlmsghdr *nlh,
 
         cfg->fc_nlinfo.pid = NETLINK_CB(skb).pid;
         cfg->fc_nlinfo.nlh = nlh;
+        cfg->fc_nlinfo.nl_net = &init_net;
 
         if (cfg->fc_type > RTN_MAX) {
                 err = -EINVAL;
@@ -670,6 +672,9 @@ static void fib_magic(int cmd, int type, __be32 dst, int dst_len, struct in_ifad
                 .fc_prefsrc = ifa->ifa_local,
                 .fc_oif = ifa->ifa_dev->dev->ifindex,
                 .fc_nlflags = NLM_F_CREATE | NLM_F_APPEND,
+                .fc_nlinfo = {
+                        .nl_net = &init_net,
+                },
         };
 
         if (type == RTN_UNICAST)