DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bluetooth: Update ERTM state before sending packets

Browse Source 
Since l2cap_ertm_send() runs in process context, it may be preempted
by incoming data being processed in tasklet context.  In order to
avoid race conditions where a packet is acknowledged before the
transmit queue is properly updated, ERTM state should be set up for
the next transmit before the packet is actually sent.

CRs-fixed: 326238
Change-Id: I3df0e93118a357dbd34ff26ad74d7c0c38bf5121
Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
This commit is contained in:
Mat Martineau
2011-12-22 12:02:13 -08:00
parent b5e793777a
commit ff10539146
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/bluetooth/l2cap_core.c
View File

@@ -1454,10 +1454,6 @@ int l2cap_ertm_send(struct sock *sk)
tx_skb->destructor = l2cap_skb_destructor;
atomic_inc(&pi->ertm_queued);
l2cap_do_send(sk, tx_skb);
BT_DBG("Sent txseq %d", (int)control->txseq);
l2cap_ertm_start_retrans_timer(pi);
pi->next_tx_seq = __next_seq(pi->next_tx_seq, pi);
@@ -1469,6 +1465,9 @@ int l2cap_ertm_send(struct sock *sk)
sk->sk_send_head = NULL;
else
sk->sk_send_head = skb_queue_next(TX_QUEUE(sk), skb);
l2cap_do_send(sk, tx_skb);
BT_DBG("Sent txseq %d", (int)control->txseq);
}
BT_DBG("Sent %d, %d unacked, %d in ERTM queue, %d in HCI queue", sent,