diff options
| author |   Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-25 17:38:20 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-11-25 17:38:20 -0800 |
| commit | a6483b790f8efcd8db190c1c0ff93f9d9efe919a (patch) | |
| tree | e05ba1d3e7014409a69d878bf9f24c5eb93365e4 /net/xfrm/xfrm_state.c | |
| parent | netns xfrm: xfrm_input() fixup (diff) | |
| download | linux-dev-a6483b790f8efcd8db190c1c0ff93f9d9efe919a.tar.xz linux-dev-a6483b790f8efcd8db190c1c0ff93f9d9efe919a.zip | |
netns xfrm: per-netns NETLINK_XFRM socket
Stub senders to init_net's one temporarily.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_state.c')
| -rw-r--r-- | net/xfrm/xfrm_state.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index ea340bbbcc64..21db37ab0a2f 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -24,9 +24,6 @@ #include "xfrm_hash.h" -struct sock *xfrm_nl; -EXPORT_SYMBOL(xfrm_nl); - u32 sysctl_xfrm_aevent_etime __read_mostly = XFRM_AE_ETIME; EXPORT_SYMBOL(sysctl_xfrm_aevent_etime); @@ -1659,7 +1656,7 @@ static void xfrm_replay_timer_handler(unsigned long data) spin_lock(&x->lock); if (x->km.state == XFRM_STATE_VALID) { - if (xfrm_aevent_is_on()) + if (xfrm_aevent_is_on(xs_net(x))) xfrm_replay_notify(x, XFRM_REPLAY_TIMEOUT); else x->xflags |= XFRM_TIME_DEFER; @@ -1715,7 +1712,7 @@ void xfrm_replay_advance(struct xfrm_state *x, __be32 net_seq) x->replay.bitmap |= (1U << diff); } - if (xfrm_aevent_is_on()) + if (xfrm_aevent_is_on(xs_net(x))) xfrm_replay_notify(x, XFRM_REPLAY_UPDATE); } |