diff options
| author |   Gustavo F. Padovan <padovan@profusion.mobi> | 2010-05-01 16:15:38 -0300 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2010-05-10 09:28:47 +0200 |
| commit | 73edaa9933219e25d6733b78d1e2c881025705e2 (patch) | |
| tree | 2b5167d266784b6a66a594b424b8c4baba068d20 /net/bluetooth/l2cap.c | |
| parent | Bluetooth: Move set of P-bit to l2cap_send_sframe() (diff) | |
| download | linux-dev-73edaa9933219e25d6733b78d1e2c881025705e2.tar.xz linux-dev-73edaa9933219e25d6733b78d1e2c881025705e2.zip | |
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 '')
| -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 __mod_retrans_timer(); pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY; - l2cap_ertm_send(sk); + if (pi->conn_state & L2CAP_CONN_SREJ_SENT) + l2cap_send_ack(pi); + else + l2cap_ertm_send(sk); } break; |