3 files changed, 22 insertions, 39 deletions

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 502cce76621d..8feb9e5d6623 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -512,12 +512,13 @@ static struct proto rose_proto = {
         .obj_size = sizeof(struct rose_sock),
 };
 
-static int rose_create(struct net *net, struct socket *sock, int protocol)
+static int rose_create(struct net *net, struct socket *sock, int protocol,
+                       int kern)
 {
         struct sock *sk;
         struct rose_sock *rose;
 
-        if (net != &init_net)
+        if (!net_eq(net, &init_net))
                 return -EAFNOSUPPORT;
 
         if (sock->type != SOCK_SEQPACKET || protocol != 0)
@@ -1509,7 +1510,7 @@ static const struct file_operations rose_info_fops = {
 };
 #endif  /* CONFIG_PROC_FS */
 
-static struct net_proto_family rose_family_ops = {
+static const struct net_proto_family rose_family_ops = {
         .family         =       PF_ROSE,
         .create         =       rose_create,
         .owner          =       THIS_MODULE,
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c
index f3e21989b88c..795c4b025e31 100644
--- a/net/rose/rose_route.c
+++ b/net/rose/rose_route.c
@@ -77,8 +77,9 @@ static int __must_check rose_add_node(struct rose_route_struct *rose_route,
 
         rose_neigh = rose_neigh_list;
         while (rose_neigh != NULL) {
-                if (ax25cmp(&rose_route->neighbour, &rose_neigh->callsign) == 0
-                    && rose_neigh->dev == dev)
+                if (ax25cmp(&rose_route->neighbour,
+                            &rose_neigh->callsign) == 0 &&
+                    rose_neigh->dev == dev)
                         break;
                 rose_neigh = rose_neigh->next;
         }
@@ -311,8 +312,9 @@ static int rose_del_node(struct rose_route_struct *rose_route,
 
         rose_neigh = rose_neigh_list;
         while (rose_neigh != NULL) {
-                if (ax25cmp(&rose_route->neighbour, &rose_neigh->callsign) == 0
-                    && rose_neigh->dev == dev)
+                if (ax25cmp(&rose_route->neighbour,
+                            &rose_neigh->callsign) == 0 &&
+                    rose_neigh->dev == dev)
                         break;
                 rose_neigh = rose_neigh->next;
         }
@@ -600,13 +602,13 @@ struct net_device *rose_dev_first(void)
 {
         struct net_device *dev, *first = NULL;
 
-        read_lock(&dev_base_lock);
-        for_each_netdev(&init_net, dev) {
+        rcu_read_lock();
+        for_each_netdev_rcu(&init_net, dev) {
                 if ((dev->flags & IFF_UP) && dev->type == ARPHRD_ROSE)
                         if (first == NULL || strncmp(dev->name, first->name, 3) < 0)
                                 first = dev;
         }
-        read_unlock(&dev_base_lock);
+        rcu_read_unlock();
 
         return first;
 }
@@ -618,8 +620,8 @@ struct net_device *rose_dev_get(rose_address *addr)
 {
         struct net_device *dev;
 
-        read_lock(&dev_base_lock);
-        for_each_netdev(&init_net, dev) {
+        rcu_read_lock();
+        for_each_netdev_rcu(&init_net, dev) {
                 if ((dev->flags & IFF_UP) && dev->type == ARPHRD_ROSE && rosecmp(addr, (rose_address *)dev->dev_addr) == 0) {
                         dev_hold(dev);
                         goto out;
@@ -627,7 +629,7 @@ struct net_device *rose_dev_get(rose_address *addr)
         }
         dev = NULL;
 out:
-        read_unlock(&dev_base_lock);
+        rcu_read_unlock();
         return dev;
 }
 
@@ -635,14 +637,14 @@ static int rose_dev_exists(rose_address *addr)
 {
         struct net_device *dev;
 
-        read_lock(&dev_base_lock);
-        for_each_netdev(&init_net, dev) {
+        rcu_read_lock();
+        for_each_netdev_rcu(&init_net, dev) {
                 if ((dev->flags & IFF_UP) && dev->type == ARPHRD_ROSE && rosecmp(addr, (rose_address *)dev->dev_addr) == 0)
                         goto out;
         }
         dev = NULL;
 out:
-        read_unlock(&dev_base_lock);
+        rcu_read_unlock();
         return dev != NULL;
 }
 
diff --git a/net/rose/sysctl_net_rose.c b/net/rose/sysctl_net_rose.c
index 3bfe504faf86..df6d9dac2186 100644
--- a/net/rose/sysctl_net_rose.c
+++ b/net/rose/sysctl_net_rose.c
@@ -26,121 +26,101 @@ static struct ctl_table_header *rose_table_header;
 
 static ctl_table rose_table[] = {
         {
-                .ctl_name       = NET_ROSE_RESTART_REQUEST_TIMEOUT,
                 .procname       = "restart_request_timeout",
                 .data           = &sysctl_rose_restart_request_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_timer,
                 .extra2         = &max_timer
         },
         {
-                .ctl_name       = NET_ROSE_CALL_REQUEST_TIMEOUT,
                 .procname       = "call_request_timeout",
                 .data           = &sysctl_rose_call_request_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_timer,
                 .extra2         = &max_timer
         },
         {
-                .ctl_name       = NET_ROSE_RESET_REQUEST_TIMEOUT,
                 .procname       = "reset_request_timeout",
                 .data           = &sysctl_rose_reset_request_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_timer,
                 .extra2         = &max_timer
         },
         {
-                .ctl_name       = NET_ROSE_CLEAR_REQUEST_TIMEOUT,
                 .procname       = "clear_request_timeout",
                 .data           = &sysctl_rose_clear_request_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_timer,
                 .extra2         = &max_timer
         },
         {
-                .ctl_name       = NET_ROSE_NO_ACTIVITY_TIMEOUT,
                 .procname       = "no_activity_timeout",
                 .data           = &sysctl_rose_no_activity_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_idle,
                 .extra2         = &max_idle
         },
         {
-                .ctl_name       = NET_ROSE_ACK_HOLD_BACK_TIMEOUT,
                 .procname       = "acknowledge_hold_back_timeout",
                 .data           = &sysctl_rose_ack_hold_back_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_timer,
                 .extra2         = &max_timer
         },
         {
-                .ctl_name       = NET_ROSE_ROUTING_CONTROL,
                 .procname       = "routing_control",
                 .data           = &sysctl_rose_routing_control,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_route,
                 .extra2         = &max_route
         },
         {
-                .ctl_name       = NET_ROSE_LINK_FAIL_TIMEOUT,
                 .procname       = "link_fail_timeout",
                 .data           = &sysctl_rose_link_fail_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_ftimer,
                 .extra2         = &max_ftimer
         },
         {
-                .ctl_name       = NET_ROSE_MAX_VCS,
                 .procname       = "maximum_virtual_circuits",
                 .data           = &sysctl_rose_maximum_vcs,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_maxvcs,
                 .extra2         = &max_maxvcs
         },
         {
-                .ctl_name       = NET_ROSE_WINDOW_SIZE,
                 .procname       = "window_size",
                 .data           = &sysctl_rose_window_size,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec_minmax,
-                .strategy       = sysctl_intvec,
                 .extra1         = &min_window,
                 .extra2         = &max_window
         },
-        { .ctl_name = 0 }
+        { }
 };
 
 static struct ctl_path rose_path[] = {
-        { .procname = "net", .ctl_name = CTL_NET, },
-        { .procname = "rose", .ctl_name = NET_ROSE, },
+        { .procname = "net", },
+        { .procname = "rose", },
         { }
 };