Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22d55328 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents 3f8c6c9c d5654efd
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -799,6 +799,7 @@ int xfrm_policy_flush(struct net *net, u8 type, struct xfrm_audit *audit_info)
				continue;
				continue;
			hlist_del(&pol->bydst);
			hlist_del(&pol->bydst);
			hlist_del(&pol->byidx);
			hlist_del(&pol->byidx);
			list_del(&pol->walk.all);
			write_unlock_bh(&xfrm_policy_lock);
			write_unlock_bh(&xfrm_policy_lock);


			xfrm_audit_policy_delete(pol, 1, audit_info->loginuid,
			xfrm_audit_policy_delete(pol, 1, audit_info->loginuid,