diff options
| author | Gustavo F. Padovan | 2010-05-10 19:54:14 +0200 |
|---|---|---|
| committer | Marcel Holtmann | 2010-07-21 19:39:07 +0200 |
| commit | 64988868637304330f7df20d08b965592312c531 (patch) | |
| tree | f58299836735fad66af1d7ff41bdbfc8553e1522 /net | |
| parent | Bluetooth: Add debug output to ERTM code (diff) | |
| download | kernel-qcow2-linux-64988868637304330f7df20d08b965592312c531.tar.gz kernel-qcow2-linux-64988868637304330f7df20d08b965592312c531.tar.xz kernel-qcow2-linux-64988868637304330f7df20d08b965592312c531.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/l2cap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 6e8a0512a9c9..65c6a989449a 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) |