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:
6e3a598
)
Bluetooth: Remove duplicate use of __get_reqseq() macro on L2CAP
author
Gustavo F. Padovan
<padovan@profusion.mobi>
Sat, 1 May 2010 19:15:38 +0000
(16:15 -0300)
committer
Marcel Holtmann
<marcel@holtmann.org>
Mon, 10 May 2010 07:28:48 +0000
(09:28 +0200)
tx_seq var already has the value of __get_reqseq().
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>
net/bluetooth/l2cap.c
patch
|
blob
|
history
diff --git
a/net/bluetooth/l2cap.c
b/net/bluetooth/l2cap.c
index d096c7c11ab5533aab49dd277feb12bc89c18811..e9ac9fb119176040dd07111c31e9a226939d42d0 100644
(file)
--- a/
net/bluetooth/l2cap.c
+++ b/
net/bluetooth/l2cap.c
@@
-3533,7
+3533,7
@@
static inline void l2cap_data_channel_rejframe(struct sock *sk, u16 rx_control)
pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
- pi->expected_ack_seq =
__get_reqseq(rx_control)
;
+ pi->expected_ack_seq =
tx_seq
;
l2cap_drop_acked_frames(sk);
if (rx_control & L2CAP_CTRL_FINAL) {