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

22d55328 · David S. Miller · 3f8c6c9c · d5654efd · 22d55328
Commit 22d55328 authored Dec 03, 2008 by David S. Miller
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

net/xfrm/xfrm_policy.c net/xfrm/xfrm_policy.c +1 -0

No files found.
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -799,6 +799,7 @@ int xfrm_policy_flush(struct net *net, 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,