Return-Path: Date: Wed, 8 Feb 2012 14:40:58 -0200 From: Gustavo Padovan To: Szymon Janc Cc: linux-bluetooth@vger.kernel.org, Luiz Augusto von Dentz , Ulisses Furquim , kanak.gupta@stericsson.com Subject: Re: [PATCH 1/2] Bluetooth: Fix possible missing I-Frame acknowledgement Message-ID: <20120208164058.GB3181@joana> References: <1328625782-19624-1-git-send-email-szymon.janc@tieto.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1328625782-19624-1-git-send-email-szymon.janc@tieto.com> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Hi Szymon, * Szymon Janc [2012-02-07 15:43:01 +0100]: > Make l2cap_ertm_send return number of pending I-Frames transmitted > instead of all (pending + retransmitted) I-Frames transmitted. > > As only pending I-Frames are considered as acknowledgement, this could > lead to situation when no ACK was sent in __l2cap_send_ack (if only > already transmitted I-Frames were retransmitted). > > Signed-off-by: Szymon Janc > --- > net/bluetooth/l2cap_core.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c > index 09cd860..5bb298d 100644 > --- a/net/bluetooth/l2cap_core.c > +++ b/net/bluetooth/l2cap_core.c > @@ -1448,8 +1448,10 @@ static int l2cap_ertm_send(struct l2cap_chan *chan) > > chan->next_tx_seq = __next_seq(chan, chan->next_tx_seq); > > - if (bt_cb(skb)->retries == 1) > + if (bt_cb(skb)->retries == 1) { > chan->unacked_frames++; > + nsent++; > + } > > chan->frames_sent++; > > @@ -1457,8 +1459,6 @@ static int l2cap_ertm_send(struct l2cap_chan *chan) > chan->tx_send_head = NULL; > else > chan->tx_send_head = skb_queue_next(&chan->tx_q, skb); > - > - nsent++; > } > > return nsent; Acked-by: Gustavo F. Padovan Gustavo