Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

11 files changed, 86 insertions, 240 deletions

diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 7a58c87baf17..2b494fac9468 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -675,11 +675,12 @@ char *dn_addr2asc(__u16 addr, char *buf)
 
 
 
-static int dn_create(struct net *net, struct socket *sock, int protocol)
+static int dn_create(struct net *net, struct socket *sock, int protocol,
+                     int kern)
 {
         struct sock *sk;
 
-        if (net != &init_net)
+        if (!net_eq(net, &init_net))
                 return -EAFNOSUPPORT;
 
         switch(sock->type) {
@@ -749,9 +750,9 @@ static int dn_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 
         if (!(saddr->sdn_flags & SDF_WILD)) {
                 if (le16_to_cpu(saddr->sdn_nodeaddrl)) {
-                        read_lock(&dev_base_lock);
+                        rcu_read_lock();
                         ldev = NULL;
-                        for_each_netdev(&init_net, dev) {
+                        for_each_netdev_rcu(&init_net, dev) {
                                 if (!dev->dn_ptr)
                                         continue;
                                 if (dn_dev_islocal(dev, dn_saddr2dn(saddr))) {
@@ -759,7 +760,7 @@ static int dn_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
                                         break;
                                 }
                         }
-                        read_unlock(&dev_base_lock);
+                        rcu_read_unlock();
                         if (ldev == NULL)
                                 return -EADDRNOTAVAIL;
                 }
@@ -1955,7 +1956,7 @@ static int dn_sendmsg(struct kiocb *iocb, struct socket *sock,
         }
 
         if ((flags & MSG_TRYHARD) && sk->sk_dst_cache)
-                dst_negative_advice(&sk->sk_dst_cache);
+                dst_negative_advice(&sk->sk_dst_cache, sk);
 
         mss = scp->segsize_rem;
         fctype = scp->services_rem & NSP_FC_MASK;
@@ -2325,7 +2326,7 @@ static const struct file_operations dn_socket_seq_fops = {
 };
 #endif
 
-static struct net_proto_family  dn_family_ops = {
+static const struct net_proto_family    dn_family_ops = {
         .family =       AF_DECnet,
         .create =       dn_create,
         .owner  =       THIS_MODULE,
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 6e1f085db06a..cead68eb254c 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -40,6 +40,7 @@
 #include <linux/skbuff.h>
 #include <linux/sysctl.h>
 #include <linux/notifier.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <net/net_namespace.h>
@@ -68,7 +69,7 @@ extern struct neigh_table dn_neigh_table;
  */
 __le16 decnet_address = 0;
 
-static DEFINE_RWLOCK(dndev_lock);
+static DEFINE_SPINLOCK(dndev_lock);
 static struct net_device *decnet_default_device;
 static BLOCKING_NOTIFIER_HEAD(dnaddr_chain);
 
@@ -89,7 +90,6 @@ static struct dn_dev_parms dn_dev_list[] =  {
         .t2 =           1,
         .t3 =           10,
         .name =         "ethernet",
-        .ctl_name =     NET_DECNET_CONF_ETHER,
         .up =           dn_eth_up,
         .down =         dn_eth_down,
         .timer3 =       dn_send_brd_hello,
@@ -101,7 +101,6 @@ static struct dn_dev_parms dn_dev_list[] =  {
         .t2 =           1,
         .t3 =           10,
         .name =         "ipgre",
-        .ctl_name =     NET_DECNET_CONF_GRE,
         .timer3 =       dn_send_brd_hello,
 },
 #if 0
@@ -112,7 +111,6 @@ static struct dn_dev_parms dn_dev_list[] =  {
         .t2 =           1,
         .t3 =           120,
         .name =         "x25",
-        .ctl_name =     NET_DECNET_CONF_X25,
         .timer3 =       dn_send_ptp_hello,
 },
 #endif
@@ -124,7 +122,6 @@ static struct dn_dev_parms dn_dev_list[] =  {
         .t2 =           1,
         .t3 =           10,
         .name =         "ppp",
-        .ctl_name =     NET_DECNET_CONF_PPP,
         .timer3 =       dn_send_brd_hello,
 },
 #endif
@@ -135,7 +132,6 @@ static struct dn_dev_parms dn_dev_list[] =  {
         .t2 =           1,
         .t3 =           120,
         .name =         "ddcmp",
-        .ctl_name =     NET_DECNET_CONF_DDCMP,
         .timer3 =       dn_send_ptp_hello,
 },
 {
@@ -145,7 +141,6 @@ static struct dn_dev_parms dn_dev_list[] =  {
         .t2 =           1,
         .t3 =           10,
         .name =         "loopback",
-        .ctl_name =     NET_DECNET_CONF_LOOPBACK,
         .timer3 =       dn_send_brd_hello,
 }
 };
@@ -166,10 +161,6 @@ static int max_priority[] = { 127 }; /* From DECnet spec */
 
 static int dn_forwarding_proc(ctl_table *, int,
                         void __user *, size_t *, loff_t *);
-static int dn_forwarding_sysctl(ctl_table *table,
-                        void __user *oldval, size_t __user *oldlenp,
-                        void __user *newval, size_t newlen);
-
 static struct dn_dev_sysctl_table {
         struct ctl_table_header *sysctl_header;
         ctl_table dn_dev_vars[5];
@@ -177,44 +168,36 @@ static struct dn_dev_sysctl_table {
         NULL,
         {
         {
-                .ctl_name = NET_DECNET_CONF_DEV_FORWARDING,
                 .procname = "forwarding",
                 .data = (void *)DN_DEV_PARMS_OFFSET(forwarding),
                 .maxlen = sizeof(int),
                 .mode = 0644,
                 .proc_handler = dn_forwarding_proc,
-                .strategy = dn_forwarding_sysctl,
         },
         {
-                .ctl_name = NET_DECNET_CONF_DEV_PRIORITY,
                 .procname = "priority",
                 .data = (void *)DN_DEV_PARMS_OFFSET(priority),
                 .maxlen = sizeof(int),
                 .mode = 0644,
                 .proc_handler = proc_dointvec_minmax,
-                .strategy = sysctl_intvec,
                 .extra1 = &min_priority,
                 .extra2 = &max_priority
         },
         {
-                .ctl_name = NET_DECNET_CONF_DEV_T2,
                 .procname = "t2",
                 .data = (void *)DN_DEV_PARMS_OFFSET(t2),
                 .maxlen = sizeof(int),
                 .mode = 0644,
                 .proc_handler = proc_dointvec_minmax,
-                .strategy = sysctl_intvec,
                 .extra1 = &min_t2,
                 .extra2 = &max_t2
         },
         {
-                .ctl_name = NET_DECNET_CONF_DEV_T3,
                 .procname = "t3",
                 .data = (void *)DN_DEV_PARMS_OFFSET(t3),
                 .maxlen = sizeof(int),
                 .mode = 0644,
                 .proc_handler = proc_dointvec_minmax,
-                .strategy = sysctl_intvec,
                 .extra1 = &min_t3,
                 .extra2 = &max_t3
         },
@@ -230,9 +213,9 @@ static void dn_dev_sysctl_register(struct net_device *dev, struct dn_dev_parms *
 #define DN_CTL_PATH_DEV 3
 
         struct ctl_path dn_ctl_path[] = {
-                { .procname = "net", .ctl_name = CTL_NET, },
-                { .procname = "decnet", .ctl_name = NET_DECNET, },
-                { .procname = "conf", .ctl_name = NET_DECNET_CONF, },
+                { .procname = "net",  },
+                { .procname = "decnet",  },
+                { .procname = "conf",  },
                 { /* to be set */ },
                 { },
         };
@@ -248,10 +231,8 @@ static void dn_dev_sysctl_register(struct net_device *dev, struct dn_dev_parms *
 
         if (dev) {
                 dn_ctl_path[DN_CTL_PATH_DEV].procname = dev->name;
-                dn_ctl_path[DN_CTL_PATH_DEV].ctl_name = dev->ifindex;
         } else {
                 dn_ctl_path[DN_CTL_PATH_DEV].procname = parms->name;
-                dn_ctl_path[DN_CTL_PATH_DEV].ctl_name = parms->ctl_name;
         }
 
         t->dn_dev_vars[0].extra1 = (void *)dev;
@@ -317,44 +298,6 @@ static int dn_forwarding_proc(ctl_table *table, int write,
 #endif
 }
 
-static int dn_forwarding_sysctl(ctl_table *table,
-                        void __user *oldval, size_t __user *oldlenp,
-                        void __user *newval, size_t newlen)
-{
-#ifdef CONFIG_DECNET_ROUTER
-        struct net_device *dev = table->extra1;
-        struct dn_dev *dn_db;
-        int value;
-
-        if (table->extra1 == NULL)
-                return -EINVAL;
-
-        dn_db = dev->dn_ptr;
-
-        if (newval && newlen) {
-                if (newlen != sizeof(int))
-                        return -EINVAL;
-
-                if (get_user(value, (int __user *)newval))
-                        return -EFAULT;
-                if (value < 0)
-                        return -EINVAL;
-                if (value > 2)
-                        return -EINVAL;
-
-                if (dn_db->parms.down)
-                        dn_db->parms.down(dev);
-                dn_db->parms.forwarding = value;
-                if (dn_db->parms.up)
-                        dn_db->parms.up(dev);
-        }
-
-        return 0;
-#else
-        return -EINVAL;
-#endif
-}
-
 #else /* CONFIG_SYSCTL */
 static void dn_dev_sysctl_unregister(struct dn_dev_parms *parms)
 {
@@ -557,7 +500,8 @@ rarok:
 struct net_device *dn_dev_get_default(void)
 {
         struct net_device *dev;
-        read_lock(&dndev_lock);
+
+        spin_lock(&dndev_lock);
         dev = decnet_default_device;
         if (dev) {
                 if (dev->dn_ptr)
@@ -565,7 +509,8 @@ struct net_device *dn_dev_get_default(void)
                 else
                         dev = NULL;
         }
-        read_unlock(&dndev_lock);
+        spin_unlock(&dndev_lock);
+
         return dev;
 }
 
@@ -575,13 +520,15 @@ int dn_dev_set_default(struct net_device *dev, int force)
         int rv = -EBUSY;
         if (!dev->dn_ptr)
                 return -ENODEV;
-        write_lock(&dndev_lock);
+
+        spin_lock(&dndev_lock);
         if (force || decnet_default_device == NULL) {
                 old = decnet_default_device;
                 decnet_default_device = dev;
                 rv = 0;
         }
-        write_unlock(&dndev_lock);
+        spin_unlock(&dndev_lock);
+
         if (old)
                 dev_put(old);
         return rv;
@@ -589,26 +536,29 @@ int dn_dev_set_default(struct net_device *dev, int force)
 
 static void dn_dev_check_default(struct net_device *dev)
 {
-        write_lock(&dndev_lock);
+        spin_lock(&dndev_lock);
         if (dev == decnet_default_device) {
                 decnet_default_device = NULL;
         } else {
                 dev = NULL;
         }
-        write_unlock(&dndev_lock);
+        spin_unlock(&dndev_lock);
+
         if (dev)
                 dev_put(dev);
 }
 
+/*
+ * Called with RTNL
+ */
 static struct dn_dev *dn_dev_by_index(int ifindex)
 {
         struct net_device *dev;
         struct dn_dev *dn_dev = NULL;
-        dev = dev_get_by_index(&init_net, ifindex);
-        if (dev) {
+
+        dev = __dev_get_by_index(&init_net, ifindex);
+        if (dev)
                 dn_dev = dev->dn_ptr;
-                dev_put(dev);
-        }
 
         return dn_dev;
 }
@@ -629,7 +579,7 @@ static int dn_nl_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
         struct dn_ifaddr *ifa, **ifap;
         int err = -EINVAL;
 
-        if (net != &init_net)
+        if (!net_eq(net, &init_net))
                 goto errout;
 
         err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, dn_ifa_policy);
@@ -668,7 +618,7 @@ static int dn_nl_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
         struct dn_ifaddr *ifa;
         int err;
 
-        if (net != &init_net)
+        if (!net_eq(net, &init_net))
                 return -EINVAL;
 
         err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, dn_ifa_policy);
@@ -782,7 +732,7 @@ static int dn_nl_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
         struct dn_dev *dn_db;
         struct dn_ifaddr *ifa;
 
-        if (net != &init_net)
+        if (!net_eq(net, &init_net))
                 return 0;
 
         skip_ndevs = cb->args[0];
@@ -826,13 +776,17 @@ static int dn_dev_get_first(struct net_device *dev, __le16 *addr)
         struct dn_dev *dn_db = (struct dn_dev *)dev->dn_ptr;
         struct dn_ifaddr *ifa;
         int rv = -ENODEV;
+
         if (dn_db == NULL)
                 goto out;
+
+        rtnl_lock();
         ifa = dn_db->ifa_list;
         if (ifa != NULL) {
                 *addr = ifa->ifa_local;
                 rv = 0;
         }
+        rtnl_unlock();
 out:
         return rv;
 }
@@ -854,9 +808,7 @@ int dn_dev_bind_default(__le16 *addr)
         dev = dn_dev_get_default();
 last_chance:
         if (dev) {
-                read_lock(&dev_base_lock);
                 rv = dn_dev_get_first(dev, addr);
-                read_unlock(&dev_base_lock);
                 dev_put(dev);
                 if (rv == 0 || dev == init_net.loopback_dev)
                         return rv;
@@ -1321,18 +1273,18 @@ static inline int is_dn_dev(struct net_device *dev)
 }
 
 static void *dn_dev_seq_start(struct seq_file *seq, loff_t *pos)
-        __acquires(&dev_base_lock)
+        __acquires(rcu)
 {
         int i;
         struct net_device *dev;
 
-        read_lock(&dev_base_lock);
+        rcu_read_lock();
 
         if (*pos == 0)
                 return SEQ_START_TOKEN;
 
         i = 1;
-        for_each_netdev(&init_net, dev) {
+        for_each_netdev_rcu(&init_net, dev) {
                 if (!is_dn_dev(dev))
                         continue;
 
@@ -1353,7 +1305,7 @@ static void *dn_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
         if (v == SEQ_START_TOKEN)
                 dev = net_device_entry(&init_net.dev_base_head);
 
-        for_each_netdev_continue(&init_net, dev) {
+        for_each_netdev_continue_rcu(&init_net, dev) {
                 if (!is_dn_dev(dev))
                         continue;
 
@@ -1364,9 +1316,9 @@ static void *dn_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 }
 
 static void dn_dev_seq_stop(struct seq_file *seq, void *v)
-        __releases(&dev_base_lock)
+        __releases(rcu)
 {
-        read_unlock(&dev_base_lock);
+        rcu_read_unlock();
 }
 
 static char *dn_type2asc(char type)
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c
index 27ea2e9b080a..4ab96c15166d 100644
--- a/net/decnet/dn_fib.c
+++ b/net/decnet/dn_fib.c
@@ -20,6 +20,7 @@
 #include <linux/string.h>
 #include <linux/net.h>
 #include <linux/socket.h>
+#include <linux/slab.h>
 #include <linux/sockios.h>
 #include <linux/init.h>
 #include <linux/skbuff.h>
@@ -509,7 +510,7 @@ static int dn_fib_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *
         struct rtattr **rta = arg;
         struct rtmsg *r = NLMSG_DATA(nlh);
 
-        if (net != &init_net)
+        if (!net_eq(net, &init_net))
                 return -EINVAL;
 
         if (dn_fib_check_attr(r, rta))
@@ -529,7 +530,7 @@ static int dn_fib_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *
         struct rtattr **rta = arg;
         struct rtmsg *r = NLMSG_DATA(nlh);
 
-        if (net != &init_net)
+        if (!net_eq(net, &init_net))
                 return -EINVAL;
 
         if (dn_fib_check_attr(r, rta))
@@ -607,8 +608,8 @@ static void dn_fib_del_ifaddr(struct dn_ifaddr *ifa)
         ASSERT_RTNL();
 
         /* Scan device list */
-        read_lock(&dev_base_lock);
-        for_each_netdev(&init_net, dev) {
+        rcu_read_lock();
+        for_each_netdev_rcu(&init_net, dev) {
                 dn_db = dev->dn_ptr;
                 if (dn_db == NULL)
                         continue;
@@ -619,7 +620,7 @@ static void dn_fib_del_ifaddr(struct dn_ifaddr *ifa)
                         }
                 }
         }
-        read_unlock(&dev_base_lock);
+        rcu_read_unlock();
 
         if (found_it == 0) {
                 fib_magic(RTM_DELROUTE, RTN_LOCAL, ifa->ifa_local, 16, ifa);
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c
index 794b5bf95af1..deb723dba44b 100644
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
@@ -28,6 +28,7 @@
 #include <linux/module.h>
 #include <linux/socket.h>
 #include <linux/if_arp.h>
+#include <linux/slab.h>
 #include <linux/if_ether.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c
index 932408dca86d..25a37299bc65 100644
--- a/net/decnet/dn_nsp_in.c
+++ b/net/decnet/dn_nsp_in.c
@@ -57,6 +57,7 @@
 #include <linux/netdevice.h>
 #include <linux/inet.h>
 #include <linux/route.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <net/tcp_states.h>
 #include <asm/system.h>
diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c
index a65e929ce76c..baeb1eaf011b 100644
--- a/net/decnet/dn_nsp_out.c
+++ b/net/decnet/dn_nsp_out.c
@@ -50,6 +50,7 @@
 #include <linux/netdevice.h>
 #include <linux/inet.h>
 #include <linux/route.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <asm/system.h>
 #include <linux/fcntl.h>
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 57662cabaf9b..70ebe74027d5 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -66,6 +66,7 @@
 #include <linux/inet.h>
 #include <linux/route.h>
 #include <linux/in_route.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <linux/mm.h>
 #include <linux/proc_fs.h>
@@ -908,8 +909,8 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old
                         dev_put(dev_out);
                         goto out;
                 }
-                read_lock(&dev_base_lock);
-                for_each_netdev(&init_net, dev) {
+                rcu_read_lock();
+                for_each_netdev_rcu(&init_net, dev) {
                         if (!dev->dn_ptr)
                                 continue;
                         if (!dn_dev_islocal(dev, oldflp->fld_src))
@@ -922,7 +923,7 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old
                         dev_out = dev;
                         break;
                 }
-                read_unlock(&dev_base_lock);
+                rcu_read_unlock();
                 if (dev_out == NULL)
                         goto out;
                 dev_hold(dev_out);
@@ -1155,8 +1156,8 @@ static int __dn_route_output_key(struct dst_entry **pprt, const struct flowi *fl
 
         if (!(flags & MSG_TRYHARD)) {
                 rcu_read_lock_bh();
-                for(rt = rcu_dereference(dn_rt_hash_table[hash].chain); rt;
-                        rt = rcu_dereference(rt->u.dst.dn_next)) {
+                for (rt = rcu_dereference_bh(dn_rt_hash_table[hash].chain); rt;
+                        rt = rcu_dereference_bh(rt->u.dst.dn_next)) {
                         if ((flp->fld_dst == rt->fl.fld_dst) &&
                             (flp->fld_src == rt->fl.fld_src) &&
                             (flp->mark == rt->fl.mark) &&
@@ -1517,7 +1518,7 @@ static int dn_cache_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, void
         struct sk_buff *skb;
         struct flowi fl;
 
-        if (net != &init_net)
+        if (!net_eq(net, &init_net))
                 return -EINVAL;
 
         memset(&fl, 0, sizeof(fl));
@@ -1602,7 +1603,7 @@ int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb)
         int h, s_h;
         int idx, s_idx;
 
-        if (net != &init_net)
+        if (!net_eq(net, &init_net))
                 return 0;
 
         if (NLMSG_PAYLOAD(cb->nlh, 0) < sizeof(struct rtmsg))
@@ -1618,9 +1619,9 @@ int dn_cache_dump(struct sk_buff *skb, struct netlink_callback *cb)
                 if (h > s_h)
                         s_idx = 0;
                 rcu_read_lock_bh();
-                for(rt = rcu_dereference(dn_rt_hash_table[h].chain), idx = 0;
+                for(rt = rcu_dereference_bh(dn_rt_hash_table[h].chain), idx = 0;
                         rt;
-                        rt = rcu_dereference(rt->u.dst.dn_next), idx++) {
+                        rt = rcu_dereference_bh(rt->u.dst.dn_next), idx++) {
                         if (idx < s_idx)
                                 continue;
                         skb_dst_set(skb, dst_clone(&rt->u.dst));
@@ -1654,12 +1655,12 @@ static struct dn_route *dn_rt_cache_get_first(struct seq_file *seq)
 
         for(s->bucket = dn_rt_hash_mask; s->bucket >= 0; --s->bucket) {
                 rcu_read_lock_bh();
-                rt = dn_rt_hash_table[s->bucket].chain;
+                rt = rcu_dereference_bh(dn_rt_hash_table[s->bucket].chain);
                 if (rt)
                         break;
                 rcu_read_unlock_bh();
         }
-        return rcu_dereference(rt);
+        return rt;
 }
 
 static struct dn_route *dn_rt_cache_get_next(struct seq_file *seq, struct dn_route *rt)
@@ -1674,7 +1675,7 @@ static struct dn_route *dn_rt_cache_get_next(struct seq_file *seq, struct dn_rou
                 rcu_read_lock_bh();
                 rt = dn_rt_hash_table[s->bucket].chain;
         }
-        return rcu_dereference(rt);
+        return rcu_dereference_bh(rt);
 }
 
 static void *dn_rt_cache_seq_start(struct seq_file *seq, loff_t *pos)
diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c
index 72495f25269f..7466c546f286 100644
--- a/net/decnet/dn_rules.c
+++ b/net/decnet/dn_rules.c
@@ -33,7 +33,7 @@
 #include <net/dn_dev.h>
 #include <net/dn_route.h>
 
-static struct fib_rules_ops dn_fib_rules_ops;
+static struct fib_rules_ops *dn_fib_rules_ops;
 
 struct dn_fib_rule
 {
@@ -56,7 +56,7 @@ int dn_fib_lookup(struct flowi *flp, struct dn_fib_res *res)
         };
         int err;
 
-        err = fib_rules_lookup(&dn_fib_rules_ops, flp, 0, &arg);
+        err = fib_rules_lookup(dn_fib_rules_ops, flp, 0, &arg);
         res->r = arg.rule;
 
         return err;
@@ -217,9 +217,9 @@ static u32 dn_fib_rule_default_pref(struct fib_rules_ops *ops)
         struct list_head *pos;
         struct fib_rule *rule;
 
-        if (!list_empty(&dn_fib_rules_ops.rules_list)) {
-                pos = dn_fib_rules_ops.rules_list.next;
-                if (pos->next != &dn_fib_rules_ops.rules_list) {
+        if (!list_empty(&dn_fib_rules_ops->rules_list)) {
+                pos = dn_fib_rules_ops->rules_list.next;
+                if (pos->next != &dn_fib_rules_ops->rules_list) {
                         rule = list_entry(pos->next, struct fib_rule, list);
                         if (rule->pref)
                                 return rule->pref - 1;
@@ -234,7 +234,7 @@ static void dn_fib_rule_flush_cache(struct fib_rules_ops *ops)
         dn_rt_cache_flush(-1);
 }
 
-static struct fib_rules_ops dn_fib_rules_ops = {
+static struct fib_rules_ops dn_fib_rules_ops_template = {
         .family         = AF_DECnet,
         .rule_size      = sizeof(struct dn_fib_rule),
         .addr_size      = sizeof(u16),
@@ -247,21 +247,23 @@ static struct fib_rules_ops dn_fib_rules_ops = {
         .flush_cache    = dn_fib_rule_flush_cache,
         .nlgroup        = RTNLGRP_DECnet_RULE,
         .policy         = dn_fib_rule_policy,
-        .rules_list     = LIST_HEAD_INIT(dn_fib_rules_ops.rules_list),
         .owner          = THIS_MODULE,
         .fro_net        = &init_net,
 };
 
 void __init dn_fib_rules_init(void)
 {
-        BUG_ON(fib_default_rule_add(&dn_fib_rules_ops, 0x7fff,
+        dn_fib_rules_ops =
+                fib_rules_register(&dn_fib_rules_ops_template, &init_net);
+        BUG_ON(IS_ERR(dn_fib_rules_ops));
+        BUG_ON(fib_default_rule_add(dn_fib_rules_ops, 0x7fff,
                                     RT_TABLE_MAIN, 0));
-        fib_rules_register(&dn_fib_rules_ops);
 }
 
 void __exit dn_fib_rules_cleanup(void)
 {
-        fib_rules_unregister(&dn_fib_rules_ops);
+        fib_rules_unregister(dn_fib_rules_ops);
+        rcu_barrier();
 }
 
 
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c
index 67054b0d550f..f2abd3755690 100644
--- a/net/decnet/dn_table.c
+++ b/net/decnet/dn_table.c
@@ -15,6 +15,7 @@
 #include <linux/string.h>
 #include <linux/net.h>
 #include <linux/socket.h>
+#include <linux/slab.h>
 #include <linux/sockios.h>
 #include <linux/init.h>
 #include <linux/skbuff.h>
@@ -471,7 +472,7 @@ int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb)
         struct hlist_node *node;
         int dumped = 0;
 
-        if (net != &init_net)
+        if (!net_eq(net, &init_net))
                 return 0;
 
         if (NLMSG_PAYLOAD(cb->nlh, 0) >= sizeof(struct rtmsg) &&
@@ -581,8 +582,9 @@ static int dn_fib_table_insert(struct dn_fib_table *tb, struct rtmsg *r, struct
                 DN_FIB_SCAN_KEY(f, fp, key) {
                         if (fi->fib_priority != DN_FIB_INFO(f)->fib_priority)
                                 break;
-                        if (f->fn_type == type && f->fn_scope == r->rtm_scope
-                                        && DN_FIB_INFO(f) == fi)
+                        if (f->fn_type == type &&
+                            f->fn_scope == r->rtm_scope &&
+                            DN_FIB_INFO(f) == fi)
                                 goto out;
                 }
 
diff --git a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c
index 6d2bd3202048..64a7f39e069f 100644
--- a/net/decnet/netfilter/dn_rtmsg.c
+++ b/net/decnet/netfilter/dn_rtmsg.c
@@ -14,6 +14,7 @@
  */
 #include <linux/module.h>
 #include <linux/skbuff.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/netfilter.h>
diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
index 2036568beea9..be3eb8e23288 100644
--- a/net/decnet/sysctl_net_decnet.c
+++ b/net/decnet/sysctl_net_decnet.c
@@ -131,39 +131,6 @@ static int parse_addr(__le16 *addr, char *str)
         return 0;
 }
 
-
-static int dn_node_address_strategy(ctl_table *table,
-                                void __user *oldval, size_t __user *oldlenp,
-                                void __user *newval, size_t newlen)
-{
-        size_t len;
-        __le16 addr;
-
-        if (oldval && oldlenp) {
-                if (get_user(len, oldlenp))
-                        return -EFAULT;
-                if (len) {
-                        if (len != sizeof(unsigned short))
-                                return -EINVAL;
-                        if (put_user(decnet_address, (__le16 __user *)oldval))
-                                return -EFAULT;
-                }
-        }
-        if (newval && newlen) {
-                if (newlen != sizeof(unsigned short))
-                        return -EINVAL;
-                if (get_user(addr, (__le16 __user *)newval))
-                        return -EFAULT;
-
-                dn_dev_devices_off();
-
-                decnet_address = addr;
-
-                dn_dev_devices_on();
-        }
-        return 0;
-}
-
 static int dn_node_address_handler(ctl_table *table, int write,
                                 void __user *buffer,
                                 size_t *lenp, loff_t *ppos)
@@ -215,64 +182,6 @@ static int dn_node_address_handler(ctl_table *table, int write,
         return 0;
 }
 
-
-static int dn_def_dev_strategy(ctl_table *table,
-                                void __user *oldval, size_t __user *oldlenp,
-                                void __user *newval, size_t newlen)
-{
-        size_t len;
-        struct net_device *dev;
-        char devname[17];
-        size_t namel;
-        int rv = 0;
-
-        devname[0] = 0;
-
-        if (oldval && oldlenp) {
-                if (get_user(len, oldlenp))
-                        return -EFAULT;
-                if (len) {
-                        dev = dn_dev_get_default();
-                        if (dev) {
-                                strcpy(devname, dev->name);
-                                dev_put(dev);
-                        }
-
-                        namel = strlen(devname) + 1;
-                        if (len > namel) len = namel;
-
-                        if (copy_to_user(oldval, devname, len))
-                                return -EFAULT;
-
-                        if (put_user(len, oldlenp))
-                                return -EFAULT;
-                }
-        }
-
-        if (newval && newlen) {
-                if (newlen > 16)
-                        return -E2BIG;
-
-                if (copy_from_user(devname, newval, newlen))
-                        return -EFAULT;
-
-                devname[newlen] = 0;
-
-                dev = dev_get_by_name(&init_net, devname);
-                if (dev == NULL)
-                        return -ENODEV;
-
-                rv = -ENODEV;
-                if (dev->dn_ptr != NULL)
-                        rv = dn_dev_set_default(dev, 1);
-                if (rv)
-                        dev_put(dev);
-        }
-
-        return rv;
-}
-
-
 static int dn_def_dev_handler(ctl_table *table, int write,
                                 void __user *buffer,
                                 size_t *lenp, loff_t *ppos)
@@ -338,138 +247,112 @@ static int dn_def_dev_handler(ctl_table *table, int write,
 
 static ctl_table dn_table[] = {
         {
-                .ctl_name = NET_DECNET_NODE_ADDRESS,
                 .procname = "node_address",
                 .maxlen = 7,
                 .mode = 0644,
                 .proc_handler = dn_node_address_handler,
-                .strategy = dn_node_address_strategy,
         },
         {
-                .ctl_name = NET_DECNET_NODE_NAME,
                 .procname = "node_name",
                 .data = node_name,
                 .maxlen = 7,
                 .mode = 0644,
                 .proc_handler = proc_dostring,
-                .strategy = sysctl_string,
         },
         {
-                .ctl_name = NET_DECNET_DEFAULT_DEVICE,
                 .procname = "default_device",
                 .maxlen = 16,
                 .mode = 0644,
                 .proc_handler = dn_def_dev_handler,
-                .strategy = dn_def_dev_strategy,
         },
         {
-                .ctl_name = NET_DECNET_TIME_WAIT,
                 .procname = "time_wait",
                 .data = &decnet_time_wait,
                 .maxlen = sizeof(int),
                 .mode = 0644,
                 .proc_handler = proc_dointvec_minmax,
-                .strategy = sysctl_intvec,
                 .extra1 = &min_decnet_time_wait,
                 .extra2 = &max_decnet_time_wait
         },
         {
-                .ctl_name = NET_DECNET_DN_COUNT,
                 .procname = "dn_count",
                 .data = &decnet_dn_count,
                 .maxlen = sizeof(int),
                 .mode = 0644,
                 .proc_handler = proc_dointvec_minmax,
-                .strategy = sysctl_intvec,
                 .extra1 = &min_state_count,
                 .extra2 = &max_state_count
         },
         {
-                .ctl_name = NET_DECNET_DI_COUNT,
                 .procname = "di_count",
                 .data = &decnet_di_count,
                 .maxlen = sizeof(int),
                 .mode = 0644,
                 .proc_handler = proc_dointvec_minmax,
-                .strategy = sysctl_intvec,
                 .extra1 = &min_state_count,
                 .extra2 = &max_state_count
         },
         {
-                .ctl_name = NET_DECNET_DR_COUNT,
                 .procname = "dr_count",
                 .data = &decnet_dr_count,
                 .maxlen = sizeof(int),
                 .mode = 0644,
                 .proc_handler = proc_dointvec_minmax,
-                .strategy = sysctl_intvec,
                 .extra1 = &min_state_count,
                 .extra2 = &max_state_count
         },
         {
-                .ctl_name = NET_DECNET_DST_GC_INTERVAL,
                 .procname = "dst_gc_interval",
                 .data = &decnet_dst_gc_interval,
                 .maxlen = sizeof(int),
                 .mode = 0644,
                 .proc_handler = proc_dointvec_minmax,
-                .strategy = sysctl_intvec,
                 .extra1 = &min_decnet_dst_gc_interval,
                 .extra2 = &max_decnet_dst_gc_interval
         },
         {
-                .ctl_name = NET_DECNET_NO_FC_MAX_CWND,
                 .procname = "no_fc_max_cwnd",
                 .data = &decnet_no_fc_max_cwnd,
                 .maxlen = sizeof(int),
                 .mode = 0644,
                 .proc_handler = proc_dointvec_minmax,
-                .strategy = sysctl_intvec,
                 .extra1 = &min_decnet_no_fc_max_cwnd,
                 .extra2 = &max_decnet_no_fc_max_cwnd
         },
        {
-                .ctl_name = NET_DECNET_MEM,
                 .procname = "decnet_mem",
                 .data = &sysctl_decnet_mem,
                 .maxlen = sizeof(sysctl_decnet_mem),
                 .mode = 0644,
                 .proc_handler = proc_dointvec,
-                .strategy = sysctl_intvec,
         },
         {
-                .ctl_name = NET_DECNET_RMEM,
                 .procname = "decnet_rmem",
                 .data = &sysctl_decnet_rmem,
                 .maxlen = sizeof(sysctl_decnet_rmem),
                 .mode = 0644,
                 .proc_handler = proc_dointvec,
-                .strategy = sysctl_intvec,
         },
         {
-                .ctl_name = NET_DECNET_WMEM,
                 .procname = "decnet_wmem",
                 .data = &sysctl_decnet_wmem,
                 .maxlen = sizeof(sysctl_decnet_wmem),
                 .mode = 0644,
                 .proc_handler = proc_dointvec,
-                .strategy = sysctl_intvec,
         },
         {
-                .ctl_name = NET_DECNET_DEBUG_LEVEL,
                 .procname = "debug",
                 .data = &decnet_debug_level,
                 .maxlen = sizeof(int),
                 .mode = 0644,
                 .proc_handler = proc_dointvec,
-                .strategy = sysctl_intvec,
         },
-        {0}
+        { }
 };
 
 static struct ctl_path dn_path[] = {
-        { .procname = "net", .ctl_name = CTL_NET, },
-        { .procname = "decnet", .ctl_name = NET_DECNET, },
+        { .procname = "net", },
+        { .procname = "decnet", },
         { }
 };