net: spread __net_init, __net_exit

[safe/jmp/linux-2.6] / net / core / rtnetlink.c

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index e2f3317..62f3878 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -733,6 +733,20 @@ static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {
        [IFLA_INFO_DATA]        = { .type = NLA_NESTED },
 };
 
+struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[])
+{
+       struct net *net;
+       /* Examine the link attributes and figure out which
+        * network namespace we are talking about.
+        */
+       if (tb[IFLA_NET_NS_PID])
+               net = get_net_ns_by_pid(nla_get_u32(tb[IFLA_NET_NS_PID]));
+       else
+               net = get_net(src_net);
+       return net;
+}
+EXPORT_SYMBOL(rtnl_link_get_net);
+
 static int validate_linkmsg(struct net_device *dev, struct nlattr *tb[])
 {
        if (dev) {
@@ -756,8 +770,7 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm,
        int err;
 
        if (tb[IFLA_NET_NS_PID]) {
-               struct net *net;
-               net = get_net_ns_by_pid(nla_get_u32(tb[IFLA_NET_NS_PID]));
+               struct net *net = rtnl_link_get_net(dev_net(dev), tb);
                if (IS_ERR(net)) {
                        err = PTR_ERR(net);
                        goto errout;
@@ -976,8 +989,8 @@ static int rtnl_dellink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
        return 0;
 }
 
-struct net_device *rtnl_create_link(struct net *net, char *ifname,
-               const struct rtnl_link_ops *ops, struct nlattr *tb[])
+struct net_device *rtnl_create_link(struct net *src_net, struct net *net,
+       char *ifname, const struct rtnl_link_ops *ops, struct nlattr *tb[])
 {
        int err;
        struct net_device *dev;
@@ -985,7 +998,7 @@ struct net_device *rtnl_create_link(struct net *net, char *ifname,
        unsigned int real_num_queues = 1;
 
        if (ops->get_tx_queues) {
-               err = ops->get_tx_queues(net, tb, &num_queues,
+               err = ops->get_tx_queues(src_net, tb, &num_queues,
                                         &real_num_queues);
                if (err)
                        goto err;
@@ -995,16 +1008,16 @@ struct net_device *rtnl_create_link(struct net *net, char *ifname,
        if (!dev)
                goto err;
 
+       dev_net_set(dev, net);
+       dev->rtnl_link_ops = ops;
        dev->real_num_tx_queues = real_num_queues;
+
        if (strchr(dev->name, '%')) {
                err = dev_alloc_name(dev, dev->name);
                if (err < 0)
                        goto err_free;
        }
 
-       dev_net_set(dev, net);
-       dev->rtnl_link_ops = ops;
-
        if (tb[IFLA_MTU])
                dev->mtu = nla_get_u32(tb[IFLA_MTU]);
        if (tb[IFLA_ADDRESS])
@@ -1083,6 +1096,7 @@ replay:
 
        if (1) {
                struct nlattr *attr[ops ? ops->maxtype + 1 : 0], **data = NULL;
+               struct net *dest_net;
 
                if (ops) {
                        if (ops->maxtype && linkinfo[IFLA_INFO_DATA]) {
@@ -1147,17 +1161,19 @@ replay:
                if (!ifname[0])
                        snprintf(ifname, IFNAMSIZ, "%s%%d", ops->kind);
 
-               dev = rtnl_create_link(net, ifname, ops, tb);
+               dest_net = rtnl_link_get_net(net, tb);
+               dev = rtnl_create_link(net, dest_net, ifname, ops, tb);
 
                if (IS_ERR(dev))
                        err = PTR_ERR(dev);
                else if (ops->newlink)
-                       err = ops->newlink(dev, tb, data);
+                       err = ops->newlink(net, dev, tb, data);
                else
                        err = register_netdevice(dev);
-
                if (err < 0 && !IS_ERR(dev))
                        free_netdev(dev);
+
+               put_net(dest_net);
                return err;
        }
 }
@@ -1348,15 +1364,15 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voi
        case NETDEV_UNREGISTER:
                rtmsg_ifinfo(RTM_DELLINK, dev, ~0U);
                break;
-       case NETDEV_REGISTER:
-               rtmsg_ifinfo(RTM_NEWLINK, dev, ~0U);
-               break;
        case NETDEV_UP:
        case NETDEV_DOWN:
                rtmsg_ifinfo(RTM_NEWLINK, dev, IFF_UP|IFF_RUNNING);
                break;
+       case NETDEV_POST_INIT:
+       case NETDEV_REGISTER:
        case NETDEV_CHANGE:
        case NETDEV_GOING_DOWN:
+       case NETDEV_UNREGISTER_BATCH:
                break;
        default:
                rtmsg_ifinfo(RTM_NEWLINK, dev, 0);
@@ -1370,7 +1386,7 @@ static struct notifier_block rtnetlink_dev_notifier = {
 };
 
 
-static int rtnetlink_net_init(struct net *net)
+static int __net_init rtnetlink_net_init(struct net *net)
 {
        struct sock *sk;
        sk = netlink_kernel_create(net, NETLINK_ROUTE, RTNLGRP_MAX,
@@ -1381,7 +1397,7 @@ static int rtnetlink_net_init(struct net *net)
        return 0;
 }
 
-static void rtnetlink_net_exit(struct net *net)
+static void __net_exit rtnetlink_net_exit(struct net *net)
 {
        netlink_kernel_release(net->rtnl);
        net->rtnl = NULL;