Merge tag 'v3.15' into next

Linux 3.15

1 files changed, 3 insertions, 2 deletions

diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
index 9f0584710c85..1450f85b946d 100644
--- a/security/selinux/include/xfrm.h
+++ b/security/selinux/include/xfrm.h
@@ -46,10 +46,11 @@ static inline void selinux_xfrm_notify_policyload(void)
 {
         struct net *net;
 
-        atomic_inc(&flow_cache_genid);
         rtnl_lock();
-        for_each_net(net)
+        for_each_net(net) {
+                atomic_inc(&net->xfrm.flow_cache_genid);
                 rt_genid_bump_all(net);
+        }
         rtnl_unlock();
 }
 #else