diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-03 03:29:24 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-03 03:29:24 -0500 |
| commit | 22d55328b7d27694718f5d64a53d2bddbbe173a5 (patch) | |
| tree | 9bb8ecd03fadca07b5887006fbd59ddaa0114bf1 /net/xfrm | |
| parent | 3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123 (diff) | |
| parent | d5654efd3ff1cd0baa935a0c9a5d89862f07d009 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/xfrm')
| -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) | |||
| 799 | continue; | 799 | continue; |
| 800 | hlist_del(&pol->bydst); | 800 | hlist_del(&pol->bydst); |
| 801 | hlist_del(&pol->byidx); | 801 | hlist_del(&pol->byidx); |
| 802 | list_del(&pol->walk.all); | ||
| 802 | write_unlock_bh(&xfrm_policy_lock); | 803 | write_unlock_bh(&xfrm_policy_lock); |
| 803 | 804 | ||
| 804 | xfrm_audit_policy_delete(pol, 1, audit_info->loginuid, | 805 | xfrm_audit_policy_delete(pol, 1, audit_info->loginuid, |