1 files changed, 10 insertions, 14 deletions

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 6cc33dc83d1c..20cfc90d5597 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1658,30 +1658,26 @@ int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, struct file * f
         struct inet6_dev *idev;
         int ret;
 
-        if (ctl->ctl_name == NET_NEIGH_RETRANS_TIME ||
-            ctl->ctl_name == NET_NEIGH_REACHABLE_TIME)
+        if ((strcmp(ctl->procname, "retrans_time") == 0) ||
+            (strcmp(ctl->procname, "base_reachable_time") == 0))
                 ndisc_warn_deprecated_sysctl(ctl, "syscall", dev ? dev->name : "default");
 
-        switch (ctl->ctl_name) {
-        case NET_NEIGH_RETRANS_TIME:
+        if (strcmp(ctl->procname, "retrans_time") == 0)
                 ret = proc_dointvec(ctl, write, filp, buffer, lenp, ppos);
-                break;
-        case NET_NEIGH_REACHABLE_TIME:
+
+        else if (strcmp(ctl->procname, "base_reachable_time") == 0)
                 ret = proc_dointvec_jiffies(ctl, write,
                                             filp, buffer, lenp, ppos);
-                break;
-        case NET_NEIGH_RETRANS_TIME_MS:
-        case NET_NEIGH_REACHABLE_TIME_MS:
+
+        else if ((strcmp(ctl->procname, "retrans_time_ms") == 0) ||
+                 (strcmp(ctl->procname, "base_reacable_time_ms") == 0))
                 ret = proc_dointvec_ms_jiffies(ctl, write,
                                                filp, buffer, lenp, ppos);
-                break;
-        default:
+        else
                 ret = -1;
-        }
 
         if (write && ret == 0 && dev && (idev = in6_dev_get(dev)) != NULL) {
-                if (ctl->ctl_name == NET_NEIGH_REACHABLE_TIME ||
-                    ctl->ctl_name == NET_NEIGH_REACHABLE_TIME_MS)
+                if (ctl->data == &idev->nd_parms->base_reachable_time)
                         idev->nd_parms->reachable_time = neigh_rand_reach_time(idev->nd_parms->base_reachable_time);
                 idev->tstamp = jiffies;
                 inet6_ifinfo_notify(RTM_NEWLINK, idev);