From: Gustavo F. Padovan <padovan@profusion.mobi>
Date: Sat, 1 May 2010 19:15:38 +0000 (-0300)
Subject: Bluetooth: Remove duplicate use of __get_reqseq() macro on L2CAP
X-Git-Tag: v2.6.35-rc1~473^2~213
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8abb52ee00c4b3f857269eb6b7145991bab869bf;p=~shefty%2Frdma-dev.git

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>
---

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index d096c7c11ab..e9ac9fb1191 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) {