summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorSuraj Sumangala <suraj@atheros.com>2011-03-09 14:44:05 +0530
committerGustavo F. Padovan <padovan@profusion.mobi>2011-03-31 14:25:25 -0300
commit23e9fde2b344c22c5176c7fd37b52c3776ef5aba (patch)
tree9ea4dc3c4ce0d06e2a7d69f2c160a76e1ef77ea4 /net/bluetooth
parent88d377b6c3c28ee54cd4c76bfe6e60f2d9bf6ae1 (diff)
downloadlinux-3.10-23e9fde2b344c22c5176c7fd37b52c3776ef5aba.tar.gz
linux-3.10-23e9fde2b344c22c5176c7fd37b52c3776ef5aba.tar.bz2
linux-3.10-23e9fde2b344c22c5176c7fd37b52c3776ef5aba.zip
Bluetooth: Increment unacked_frames count only the first transmit
This patch lets 'l2cap_pinfo.unacked_frames' be incremented only the first time a frame is transmitted. Previously it was being incremented for retransmitted packets too resulting the value to cross the transmit window size. Signed-off-by: Suraj Sumangala <suraj@atheros.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/l2cap_core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index c9f9cecca52..ca27f3a4153 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1116,7 +1116,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))