projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
59203a2
)
Bluetooth: Remove set of SrejSaveReqSeq under receipt of REJ frame
author
Gustavo F. Padovan
<
[email protected]
>
Wed, 5 May 2010 23:56:43 +0000
(20:56 -0300)
committer
Marcel Holtmann
<
[email protected]
>
Mon, 10 May 2010 07:28:52 +0000
(09:28 +0200)
That action is not specified by the ERTM spec, so removing it.
Signed-off-by: Gustavo F. Padovan <
[email protected]
>
Reviewed-by: João Paulo Rechi Vita <
[email protected]
>
Signed-off-by: Marcel Holtmann <
[email protected]
>
net/bluetooth/l2cap.c
patch
|
blob
|
history
diff --git
a/net/bluetooth/l2cap.c
b/net/bluetooth/l2cap.c
index 2a981de071dffa5f5d2d9fead3ded7b708816f0b..d0d03302e14d9ac0c7a9e7548459675a287a26f3 100644
(file)
--- a/
net/bluetooth/l2cap.c
+++ b/
net/bluetooth/l2cap.c
@@
-3670,10
+3670,8
@@
static inline void l2cap_data_channel_rejframe(struct sock *sk, u16 rx_control)
pi->next_tx_seq = pi->expected_ack_seq;
l2cap_ertm_send(sk);
- if (pi->conn_state & L2CAP_CONN_WAIT_F) {
- pi->srej_save_reqseq = tx_seq;
+ if (pi->conn_state & L2CAP_CONN_WAIT_F)
pi->conn_state |= L2CAP_CONN_REJ_ACT;
- }
}
}
static inline void l2cap_data_channel_srejframe(struct sock *sk, u16 rx_control)