Bluetooth: Tweaks to l2cap_send_i_or_rr_or_rnr() flow

l2cap_send_sframe() already set the F-bit if we set L2CAP_CONN_SEND_FBIT
and unset L2CAP_CONN_SEND_FBIT after send the F-bit.

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: João Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 6e8a051..65c6a98 100644 (file)
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -3408,10 +3408,9 @@ static inline void l2cap_send_i_or_rr_or_rnr(struct sock *sk)
        control |= pi->buffer_seq << L2CAP_CTRL_REQSEQ_SHIFT;
 
        if (pi->conn_state & L2CAP_CONN_LOCAL_BUSY) {
-               control |= L2CAP_SUPER_RCV_NOT_READY | L2CAP_CTRL_FINAL;
+               control |= L2CAP_SUPER_RCV_NOT_READY;
                l2cap_send_sframe(pi, control);
                pi->conn_state |= L2CAP_CONN_RNR_SENT;
-               pi->conn_state &= ~L2CAP_CONN_SEND_FBIT;
        }
 
        if (pi->conn_state & L2CAP_CONN_REMOTE_BUSY)