summaryrefslogtreecommitdiffstats
path: root/net/xfrm/xfrm_policy.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-12 12:00:02 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-12 12:00:14 +0100
commit92bf73e90a35d40ebc1446488218f03833b36f86 (patch)
tree8aaae58fcb7f3e06e63a5214f910acf47f4cc9d6 /net/xfrm/xfrm_policy.c
parent447557ac7ce120306b4a31d6003faef39cb1bf14 (diff)
parent915b0d0104b72fd36af088ba4b11b5690bc96a6c (diff)
downloadkernel-crypto-92bf73e90a35d40ebc1446488218f03833b36f86.tar.gz
kernel-crypto-92bf73e90a35d40ebc1446488218f03833b36f86.tar.xz
kernel-crypto-92bf73e90a35d40ebc1446488218f03833b36f86.zip
Merge branch 'x86/irq' into perfcounters/core
( with manual semantic merge of arch/x86/kernel/cpu/perf_counter.c )
Diffstat (limited to 'net/xfrm/xfrm_policy.c')
-rw-r--r--net/xfrm/xfrm_policy.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 058f04f54b9..fb216c9adf8 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -817,6 +817,7 @@ int xfrm_policy_flush(u8 type, struct xfrm_audit *audit_info)
continue;
hlist_del(&pol->bydst);
hlist_del(&pol->byidx);
+ list_del(&pol->walk.all);
write_unlock_bh(&xfrm_policy_lock);
xfrm_audit_policy_delete(pol, 1, audit_info->loginuid,