Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

4 files changed, 45 insertions, 25 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 819b7777f3cb..8697551b16a8 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -5415,13 +5415,10 @@ static int addrconf_sysctl_stable_secret(struct ctl_table *ctl, int write,
                 goto out;
         }
 
-        if (!write) {
-                err = snprintf(str, sizeof(str), "%pI6",
-                               &secret->secret);
-                if (err >= sizeof(str)) {
-                        err = -EIO;
-                        goto out;
-                }
+        err = snprintf(str, sizeof(str), "%pI6", &secret->secret);
+        if (err >= sizeof(str)) {
+                err = -EIO;
+                goto out;
         }
 
         err = proc_dostring(&lctl, write, buffer, lenp, ppos);
diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c
index 882124ebb438..a8f6986dcbe5 100644
--- a/net/ipv6/addrlabel.c
+++ b/net/ipv6/addrlabel.c
@@ -552,7 +552,7 @@ static int ip6addrlbl_get(struct sk_buff *in_skb, struct nlmsghdr *nlh)
 
         rcu_read_lock();
         p = __ipv6_addr_label(net, addr, ipv6_addr_type(addr), ifal->ifal_index);
-        if (p && ip6addrlbl_hold(p))
+        if (p && !ip6addrlbl_hold(p))
                 p = NULL;
         lseq = ip6addrlbl_table.seq;
         rcu_read_unlock();
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index d6161e1c48c8..84afb9a77278 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1183,7 +1183,7 @@ static void ndisc_router_discovery(struct sk_buff *skb)
          */
         if (!in6_dev->cnf.accept_ra_from_local &&
             ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr,
-                          NULL, 0)) {
+                          in6_dev->dev, 0)) {
                 ND_PRINTK(2, info,
                           "RA from local address detected on dev: %s: default router ignored\n",
                           skb->dev->name);
@@ -1337,7 +1337,7 @@ skip_linkparms:
 #ifdef CONFIG_IPV6_ROUTE_INFO
         if (!in6_dev->cnf.accept_ra_from_local &&
             ipv6_chk_addr(dev_net(in6_dev->dev), &ipv6_hdr(skb)->saddr,
-                          NULL, 0)) {
+                          in6_dev->dev, 0)) {
                 ND_PRINTK(2, info,
                           "RA from local address detected on dev: %s: router info ignored.\n",
                           skb->dev->name);
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 5643423fe67a..c074771a10f7 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -279,7 +279,7 @@ static void xfrm6_dst_ifdown(struct dst_entry *dst, struct net_device *dev,
         xfrm_dst_ifdown(dst, dev);
 }
 
-static struct dst_ops xfrm6_dst_ops = {
+static struct dst_ops xfrm6_dst_ops_template = {
         .family =               AF_INET6,
         .gc =                   xfrm6_garbage_collect,
         .update_pmtu =          xfrm6_update_pmtu,
@@ -293,7 +293,7 @@ static struct dst_ops xfrm6_dst_ops = {
 
 static struct xfrm_policy_afinfo xfrm6_policy_afinfo = {
         .family =               AF_INET6,
-        .dst_ops =              &xfrm6_dst_ops,
+        .dst_ops =              &xfrm6_dst_ops_template,
         .dst_lookup =           xfrm6_dst_lookup,
         .get_saddr =            xfrm6_get_saddr,
         .decode_session =       _decode_session6,
@@ -325,7 +325,7 @@ static struct ctl_table xfrm6_policy_table[] = {
         { }
 };
 
-static int __net_init xfrm6_net_init(struct net *net)
+static int __net_init xfrm6_net_sysctl_init(struct net *net)
 {
         struct ctl_table *table;
         struct ctl_table_header *hdr;
@@ -353,7 +353,7 @@ err_alloc:
         return -ENOMEM;
 }
 
-static void __net_exit xfrm6_net_exit(struct net *net)
+static void __net_exit xfrm6_net_sysctl_exit(struct net *net)
 {
         struct ctl_table *table;
 
@@ -365,24 +365,52 @@ static void __net_exit xfrm6_net_exit(struct net *net)
         if (!net_eq(net, &init_net))
                 kfree(table);
 }
+#else /* CONFIG_SYSCTL */
+static int inline xfrm6_net_sysctl_init(struct net *net)
+{
+        return 0;
+}
+
+static void inline xfrm6_net_sysctl_exit(struct net *net)
+{
+}
+#endif
+
+static int __net_init xfrm6_net_init(struct net *net)
+{
+        int ret;
+
+        memcpy(&net->xfrm.xfrm6_dst_ops, &xfrm6_dst_ops_template,
+               sizeof(xfrm6_dst_ops_template));
+        ret = dst_entries_init(&net->xfrm.xfrm6_dst_ops);
+        if (ret)
+                return ret;
+
+        ret = xfrm6_net_sysctl_init(net);
+        if (ret)
+                dst_entries_destroy(&net->xfrm.xfrm6_dst_ops);
+
+        return ret;
+}
+
+static void __net_exit xfrm6_net_exit(struct net *net)
+{
+        xfrm6_net_sysctl_exit(net);
+        dst_entries_destroy(&net->xfrm.xfrm6_dst_ops);
+}
 
 static struct pernet_operations xfrm6_net_ops = {
         .init   = xfrm6_net_init,
         .exit   = xfrm6_net_exit,
 };
-#endif
 
 int __init xfrm6_init(void)
 {
         int ret;
 
-        dst_entries_init(&xfrm6_dst_ops);
-
         ret = xfrm6_policy_init();
-        if (ret) {
-                dst_entries_destroy(&xfrm6_dst_ops);
+        if (ret)
                 goto out;
-        }
         ret = xfrm6_state_init();
         if (ret)
                 goto out_policy;
@@ -391,9 +419,7 @@ int __init xfrm6_init(void)
         if (ret)
                 goto out_state;
 
-#ifdef CONFIG_SYSCTL
         register_pernet_subsys(&xfrm6_net_ops);
-#endif
 out:
         return ret;
 out_state:
@@ -405,11 +431,8 @@ out_policy:
 
 void xfrm6_fini(void)
 {
-#ifdef CONFIG_SYSCTL
         unregister_pernet_subsys(&xfrm6_net_ops);
-#endif
         xfrm6_protocol_fini();
         xfrm6_policy_fini();
         xfrm6_state_fini();
-        dst_entries_destroy(&xfrm6_dst_ops);
 }