diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-03-31 16:26:01 -0300 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-03-31 16:26:01 -0300 |
| commit | 220b881a77eca96afdd6037dbca3441e8938228f (patch) | |
| tree | 51d1a273521238b5127409c9ea2c0b2df02ec6e9 /net/bluetooth/l2cap_core.c | |
| parent | 80a1e1dbf62a08984d4c1bfb5a4bca38c3e1664f (diff) | |
| parent | 6f5ef998b7b0b1bf1471654bf6176a5419197128 (diff) | |
| download | linux-220b881a77eca96afdd6037dbca3441e8938228f.tar.gz linux-220b881a77eca96afdd6037dbca3441e8938228f.tar.bz2 linux-220b881a77eca96afdd6037dbca3441e8938228f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 033c83be3524..c3cebed205cc 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -1115,7 +1115,9 @@ int l2cap_ertm_send(struct sock *sk) bt_cb(skb)->tx_seq = pi->next_tx_seq; pi->next_tx_seq = (pi->next_tx_seq + 1) % 64; - pi->unacked_frames++; + if (bt_cb(skb)->retries == 1) + pi->unacked_frames++; + pi->frames_sent++; if (skb_queue_is_last(TX_QUEUE(sk), skb)) |