aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2010-05-01 16:15:38 -0300
committerMarcel Holtmann <marcel@holtmann.org>2010-05-10 09:28:48 +0200
commit8abb52ee00c4b3f857269eb6b7145991bab869bf (patch)
treef7879f9c4e78e30f9ad74b59627c1e9b0ee0c05e /net
parent6e3a59819fac19006fe4255b87928e5a12c54532 (diff)
downloadkernel_samsung_aries-8abb52ee00c4b3f857269eb6b7145991bab869bf.zip
kernel_samsung_aries-8abb52ee00c4b3f857269eb6b7145991bab869bf.tar.gz
kernel_samsung_aries-8abb52ee00c4b3f857269eb6b7145991bab869bf.tar.bz2
Bluetooth: Remove duplicate use of __get_reqseq() macro on L2CAP
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>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index d096c7c..e9ac9fb 100644
--- 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) {