git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
[sfrench/cifs-2.6.git]
/
include
/
net
/
netns
/
xfrm.h
diff --git
a/include/net/netns/xfrm.h
b/include/net/netns/xfrm.h
index e946366e8ba5f2aef8b39a56c79ce8a1000129b9..1f4e1816fd36444624d9d0c497afea53bdc2a5e6 100644
(file)
--- a/
include/net/netns/xfrm.h
+++ b/
include/net/netns/xfrm.h
@@
-75,6
+75,7
@@
struct netns_xfrm {
#endif
spinlock_t xfrm_state_lock;
seqcount_spinlock_t xfrm_state_hash_generation;
+ seqcount_spinlock_t xfrm_policy_hash_generation;
spinlock_t xfrm_policy_lock;
struct mutex xfrm_cfg_mutex;