1 files changed, 11 insertions, 14 deletions

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index f1c62ba0f56b..172438320eec 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -516,13 +516,13 @@ static void __ndisc_send(struct net_device *dev,
         skb->dst = dst;
 
         idev = in6_dev_get(dst->dev);
-        IP6_INC_STATS(idev, IPSTATS_MIB_OUTREQUESTS);
+        IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTREQUESTS);
 
         err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev,
                       dst_output);
         if (!err) {
-                ICMP6MSGOUT_INC_STATS(idev, type);
-                ICMP6_INC_STATS(idev, ICMP6_MIB_OUTMSGS);
+                ICMP6MSGOUT_INC_STATS(net, idev, type);
+                ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);
         }
 
         if (likely(idev != NULL))
@@ -1199,7 +1199,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
                 }
                 neigh->flags |= NTF_ROUTER;
         } else if (rt) {
-                rt->rt6i_flags |= (rt->rt6i_flags & ~RTF_PREF_MASK) | RTF_PREF(pref);
+                rt->rt6i_flags = (rt->rt6i_flags & ~RTF_PREF_MASK) | RTF_PREF(pref);
         }
 
         if (rt)
@@ -1581,12 +1581,12 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
 
         buff->dst = dst;
         idev = in6_dev_get(dst->dev);
-        IP6_INC_STATS(idev, IPSTATS_MIB_OUTREQUESTS);
+        IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTREQUESTS);
         err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, buff, NULL, dst->dev,
                       dst_output);
         if (!err) {
-                ICMP6MSGOUT_INC_STATS(idev, NDISC_REDIRECT);
-                ICMP6_INC_STATS(idev, ICMP6_MIB_OUTMSGS);
+                ICMP6MSGOUT_INC_STATS(net, idev, NDISC_REDIRECT);
+                ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);
         }
 
         if (likely(idev != NULL))
@@ -1730,9 +1730,8 @@ int ndisc_ifinfo_sysctl_change(struct ctl_table *ctl, int write, struct file * f
         return ret;
 }
 
-int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name,
-                                 int nlen, void __user *oldval,
-                                 size_t __user *oldlenp,
+int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl,
+                                 void __user *oldval, size_t __user *oldlenp,
                                  void __user *newval, size_t newlen)
 {
         struct net_device *dev = ctl->extra1;
@@ -1745,13 +1744,11 @@ int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl, int __user *name,
 
         switch (ctl->ctl_name) {
         case NET_NEIGH_REACHABLE_TIME:
-                ret = sysctl_jiffies(ctl, name, nlen,
-                                     oldval, oldlenp, newval, newlen);
+                ret = sysctl_jiffies(ctl, oldval, oldlenp, newval, newlen);
                 break;
         case NET_NEIGH_RETRANS_TIME_MS:
         case NET_NEIGH_REACHABLE_TIME_MS:
-                 ret = sysctl_ms_jiffies(ctl, name, nlen,
-                                         oldval, oldlenp, newval, newlen);
+                 ret = sysctl_ms_jiffies(ctl, oldval, oldlenp, newval, newlen);
                  break;
         default:
                 ret = 0;