From: Gustavo F. Padovan Date: Mon, 10 May 2010 17:54:14 +0000 (-0300) Subject: Bluetooth: Tweaks to l2cap_send_i_or_rr_or_rnr() flow X-Git-Tag: v2.6.36-rc1~571^2~64^2~48^2~38 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64988868637304330f7df20d08b965592312c531;p=platform%2Fkernel%2Flinux-3.10.git 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 Reviewed-by: João Paulo Rechi Vita Signed-off-by: Marcel Holtmann --- diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 6e8a051..65c6a98 100644 --- 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)