1 files changed, 2 insertions, 8 deletions

diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c
index d0de30e89591..3d106767b272 100644
--- a/net/ax25/ax25_dev.c
+++ b/net/ax25/ax25_dev.c
@@ -59,8 +59,6 @@ void ax25_dev_device_up(struct net_device *dev)
                 return;
         }
 
-        ax25_unregister_sysctl();
-
         dev->ax25_ptr     = ax25_dev;
         ax25_dev->dev     = dev;
         dev_hold(dev);
@@ -90,7 +88,7 @@ void ax25_dev_device_up(struct net_device *dev)
         ax25_dev_list  = ax25_dev;
         spin_unlock_bh(&ax25_dev_lock);
 
-        ax25_register_sysctl();
+        ax25_register_dev_sysctl(ax25_dev);
 }
 
 void ax25_dev_device_down(struct net_device *dev)
@@ -100,7 +98,7 @@ void ax25_dev_device_down(struct net_device *dev)
         if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL)
                 return;
 
-        ax25_unregister_sysctl();
+        ax25_unregister_dev_sysctl(ax25_dev);
 
         spin_lock_bh(&ax25_dev_lock);
 
@@ -120,7 +118,6 @@ void ax25_dev_device_down(struct net_device *dev)
                 spin_unlock_bh(&ax25_dev_lock);
                 dev_put(dev);
                 kfree(ax25_dev);
-                ax25_register_sysctl();
                 return;
         }
 
@@ -130,7 +127,6 @@ void ax25_dev_device_down(struct net_device *dev)
                         spin_unlock_bh(&ax25_dev_lock);
                         dev_put(dev);
                         kfree(ax25_dev);
-                        ax25_register_sysctl();
                         return;
                 }
 
@@ -138,8 +134,6 @@ void ax25_dev_device_down(struct net_device *dev)
         }
         spin_unlock_bh(&ax25_dev_lock);
         dev->ax25_ptr = NULL;
-
-        ax25_register_sysctl();
 }
 
 int ax25_fwd_ioctl(unsigned int cmd, struct ax25_fwd_struct *fwd)