commit 6db8c62f1b8e93485bc3ac3fa9e641cfe77eeef9
author Linux Build Service Account <lnxbuild@localhost> Tue Dec 20 15:39:46 2011 -0800
committer QuIC Gerrit Code Review <code-review@localhost> Tue Dec 20 15:39:46 2011 -0800
tree 37fd75c76c2b78c085d7a7a836c9894cc9fc9422
parent b7b13f07b1b7f3c721752163f8b0279042636a02
parent 380dcd40cd7fb87d7c7eeeb6efde32efc65d4d3c

Merge "Bluetooth: Clear sk_send_head when purging ERTM transmit queue" into msm-3.0

net/bluetooth/l2cap_core.c

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index a3f3563..31a726a 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -569,6 +569,7 @@
 	} else
 		sk->sk_state_change(sk);
 
+	sk->sk_send_head = NULL;
 	skb_queue_purge(TX_QUEUE(sk));
 
 	if (l2cap_pi(sk)->mode == L2CAP_MODE_ERTM) {
@@ -782,6 +783,7 @@
 	if (!conn)
 		return;
 
+	sk->sk_send_head = NULL;
 	skb_queue_purge(TX_QUEUE(sk));
 
 	if (l2cap_pi(sk)->mode == L2CAP_MODE_ERTM) {
@@ -4515,6 +4517,7 @@
 	if (sk->sk_state != BT_DISCONN) {
 		sk->sk_shutdown = SHUTDOWN_MASK;
 
+		sk->sk_send_head = NULL;
 		skb_queue_purge(TX_QUEUE(sk));
 
 		if (l2cap_pi(sk)->mode == L2CAP_MODE_ERTM) {