Hi Szymon, On Tue, Feb 7, 2012 at 4:43 PM, Szymon Janc <szymon.janc@xxxxxxxxx> wrote: > 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 <szymon.janc@xxxxxxxxx> > --- > 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; > -- > on behalf of ST-Ericsson > Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx> -- Luiz Augusto von Dentz -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html