Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

Steffen Klassert says:

====================
pull request (net): ipsec 2015-12-22

Just one patch to fix dst_entries_init with multiple namespaces.
From Dan Streetman.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 0 insertions, 38 deletions

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 948fa5560de5..b5e665b3cfb0 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2826,7 +2826,6 @@ static struct neighbour *xfrm_neigh_lookup(const struct dst_entry *dst,
 
 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
 {
-        struct net *net;
         int err = 0;
         if (unlikely(afinfo == NULL))
                 return -EINVAL;
@@ -2857,26 +2856,6 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
         }
         spin_unlock(&xfrm_policy_afinfo_lock);
 
-        rtnl_lock();
-        for_each_net(net) {
-                struct dst_ops *xfrm_dst_ops;
-
-                switch (afinfo->family) {
-                case AF_INET:
-                        xfrm_dst_ops = &net->xfrm.xfrm4_dst_ops;
-                        break;
-#if IS_ENABLED(CONFIG_IPV6)
-                case AF_INET6:
-                        xfrm_dst_ops = &net->xfrm.xfrm6_dst_ops;
-                        break;
-#endif
-                default:
-                        BUG();
-                }
-                *xfrm_dst_ops = *afinfo->dst_ops;
-        }
-        rtnl_unlock();
-
         return err;
 }
 EXPORT_SYMBOL(xfrm_policy_register_afinfo);
@@ -2912,22 +2891,6 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo)
 }
 EXPORT_SYMBOL(xfrm_policy_unregister_afinfo);
 
-static void __net_init xfrm_dst_ops_init(struct net *net)
-{
-        struct xfrm_policy_afinfo *afinfo;
-
-        rcu_read_lock();
-        afinfo = rcu_dereference(xfrm_policy_afinfo[AF_INET]);
-        if (afinfo)
-                net->xfrm.xfrm4_dst_ops = *afinfo->dst_ops;
-#if IS_ENABLED(CONFIG_IPV6)
-        afinfo = rcu_dereference(xfrm_policy_afinfo[AF_INET6]);
-        if (afinfo)
-                net->xfrm.xfrm6_dst_ops = *afinfo->dst_ops;
-#endif
-        rcu_read_unlock();
-}
-
 static int xfrm_dev_event(struct notifier_block *this, unsigned long event, void *ptr)
 {
         struct net_device *dev = netdev_notifier_info_to_dev(ptr);
@@ -3076,7 +3039,6 @@ static int __net_init xfrm_net_init(struct net *net)
         rv = xfrm_policy_init(net);
         if (rv < 0)
                 goto out_policy;
-        xfrm_dst_ops_init(net);
         rv = xfrm_sysctl_init(net);
         if (rv < 0)
                 goto out_sysctl;