Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 180201
b: refs/heads/master
c: e420aba
h: refs/heads/master
i:
  180199: 33eb4a3
v: v3
  • Loading branch information
Andrei Emeltchenko authored and Marcel Holtmann committed Jan 30, 2010
1 parent 8f8522c commit 7019788
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fcafde2e6d81aa7901f9b10e6a097592f0637b79
refs/heads/master: e420aba331f44de0eed6871441293a6124d566d1
3 changes: 2 additions & 1 deletion trunk/net/bluetooth/l2cap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1368,14 +1368,15 @@ static int l2cap_ertm_send(struct sock *sk)

while ((skb = sk->sk_send_head) && (!l2cap_tx_window_full(sk)) &&
!(pi->conn_state & L2CAP_CONN_REMOTE_BUSY)) {
tx_skb = skb_clone(skb, GFP_ATOMIC);

if (pi->remote_max_tx &&
bt_cb(skb)->retries == pi->remote_max_tx) {
l2cap_send_disconn_req(pi->conn, sk);
break;
}

tx_skb = skb_clone(skb, GFP_ATOMIC);

bt_cb(skb)->retries++;

control = get_unaligned_le16(tx_skb->data + L2CAP_HDR_SIZE);
Expand Down

0 comments on commit 7019788

Please sign in to comment.