git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
ipv6
/
xfrm6_state.c
diff --git
a/net/ipv6/xfrm6_state.c
b/net/ipv6/xfrm6_state.c
index
a572302
..
b33296b
100644
(file)
--- a/
net/ipv6/xfrm6_state.c
+++ b/
net/ipv6/xfrm6_state.c
@@
-135,7
+135,6
@@
__xfrm6_find_acq(u8 mode, u32 reqid, u8 proto,
static struct xfrm_state_afinfo xfrm6_state_afinfo = {
.family = AF_INET6,
- .lock = RW_LOCK_UNLOCKED,
.init_tempsel = __xfrm6_init_tempsel,
.state_lookup = __xfrm6_state_lookup,
.find_acq = __xfrm6_find_acq,