diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-03 00:29:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-03 00:29:24 -0800 |
| commit | 22d55328b7d27694718f5d64a53d2bddbbe173a5 (patch) | |
| tree | 9bb8ecd03fadca07b5887006fbd59ddaa0114bf1 /net | |
| parent | 3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123 (diff) | |
| parent | d5654efd3ff1cd0baa935a0c9a5d89862f07d009 (diff) | |
| download | linux-22d55328b7d27694718f5d64a53d2bddbbe173a5.tar.gz linux-22d55328b7d27694718f5d64a53d2bddbbe173a5.tar.bz2 linux-22d55328b7d27694718f5d64a53d2bddbbe173a5.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 393cc65dbfa4..62a49a1f2475 100644 --- 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, |