Skip to content

Commit

Permalink
Bluetooth: Do not purge queue in Basic Mode
Browse files Browse the repository at this point in the history
chan->tx_q is only initialized if we use ERTM or Streaming mode.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Gustavo Padovan authored and Johan Hedberg committed Jun 5, 2012
1 parent d1de6d4 commit ee556f6
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions net/bluetooth/l2cap_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -549,9 +549,11 @@ static void l2cap_chan_del(struct l2cap_chan *chan, int err)
if (test_bit(CONF_NOT_COMPLETE, &chan->conf_state))
return;

skb_queue_purge(&chan->tx_q);
switch(chan->mode) {
case L2CAP_MODE_BASIC:
break;

if (chan->mode == L2CAP_MODE_ERTM) {
case L2CAP_MODE_ERTM:
__clear_retrans_timer(chan);
__clear_monitor_timer(chan);
__clear_ack_timer(chan);
Expand All @@ -560,7 +562,15 @@ static void l2cap_chan_del(struct l2cap_chan *chan, int err)

l2cap_seq_list_free(&chan->srej_list);
l2cap_seq_list_free(&chan->retrans_list);

/* fall through */

case L2CAP_MODE_STREAMING:
skb_queue_purge(&chan->tx_q);
break;
}

return;
}

static void l2cap_chan_cleanup_listen(struct sock *parent)
Expand Down

0 comments on commit ee556f6

Please sign in to comment.