diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-05-01 15:15:38 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2010-05-10 03:28:47 -0400 |
commit | 73edaa9933219e25d6733b78d1e2c881025705e2 (patch) | |
tree | 2b5167d266784b6a66a594b424b8c4baba068d20 /net | |
parent | f0946ccfc7da403a46b7ff7cb2e3deffac108742 (diff) |
Bluetooth: Add Recv RR (P=0)(F=0) for SREJ_SENT state on ERTM
This finishes the implementation of Recv RR (P=0)(F=0) for the Enhanced
Retransmission Mode on L2CAP.
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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 852c1400d069..e5cd64ac6fb2 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c | |||
@@ -3517,7 +3517,10 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str | |||
3517 | __mod_retrans_timer(); | 3517 | __mod_retrans_timer(); |
3518 | 3518 | ||
3519 | pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY; | 3519 | pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY; |
3520 | l2cap_ertm_send(sk); | 3520 | if (pi->conn_state & L2CAP_CONN_SREJ_SENT) |
3521 | l2cap_send_ack(pi); | ||
3522 | else | ||
3523 | l2cap_ertm_send(sk); | ||
3521 | } | 3524 | } |
3522 | break; | 3525 | break; |
3523 | 3526 | ||