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

Conflicts: net/bluetooth/l2cap_core.c
2011-07-14 07:56:40 -07:00
parent f6b72b6217 51414d4108
commit 6a7ebdf2fd
350 changed files with 26461 additions and 1789 deletions
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@ -1345,6 +1345,8 @@ out:
 			xfrm_state_check_expire(x1);

 		err = 0;
+		x->km.state = XFRM_STATE_DEAD;
+		__xfrm_state_put(x);
 	}
 	spin_unlock_bh(&x1->lock);