Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Conflicts:
	net/netfilter/core.c
	net/netfilter/nf_tables_netdev.c

Resolve two conflicts before pull request for David's net-next tree:

1) Between c73c24849011 ("netfilter: nf_tables_netdev: remove redundant
   ip_hdr assignment") from the net tree and commit ddc8b6027ad0
   ("netfilter: introduce nft_set_pktinfo_{ipv4, ipv6}_validate()").

2) Between e8bffe0cf964 ("net: Add _nf_(un)register_hooks symbols") and
   Aaron Conole's patches to replace list_head with single linked list.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

1 files changed, 5 insertions, 7 deletions

diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
index 24cd3949a9a4..27bb9633c69d 100644
--- a/include/net/netns/xfrm.h
+++ b/include/net/netns/xfrm.h
@@ -11,7 +11,7 @@
 struct ctl_table_header;
 
 struct xfrm_policy_hash {
-        struct hlist_head       *table;
+        struct hlist_head       __rcu *table;
         unsigned int            hmask;
         u8                      dbits4;
         u8                      sbits4;
@@ -38,14 +38,12 @@ struct netns_xfrm {
          * mode. Also, it can be used by ah/esp icmp error handler to find
          * offending SA.
          */
-        struct hlist_head       *state_bydst;
-        struct hlist_head       *state_bysrc;
-        struct hlist_head       *state_byspi;
+        struct hlist_head       __rcu *state_bydst;
+        struct hlist_head       __rcu *state_bysrc;
+        struct hlist_head       __rcu *state_byspi;
         unsigned int            state_hmask;
         unsigned int            state_num;
         struct work_struct      state_hash_work;
-        struct hlist_head       state_gc_list;
-        struct work_struct      state_gc_work;
 
         struct list_head        policy_all;
         struct hlist_head       *policy_byidx;
@@ -73,7 +71,7 @@ struct netns_xfrm {
         struct dst_ops          xfrm6_dst_ops;
 #endif
         spinlock_t xfrm_state_lock;
-        rwlock_t xfrm_policy_lock;
+        spinlock_t xfrm_policy_lock;
         struct mutex xfrm_cfg_mutex;
 
         /* flow cache part */