aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/bluetooth/l2cap_core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 27b2cd124f00..bd5d9926bf4f 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -3522,9 +3522,6 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont
3522 chan->expected_ack_seq = req_seq; 3522 chan->expected_ack_seq = req_seq;
3523 l2cap_drop_acked_frames(chan); 3523 l2cap_drop_acked_frames(chan);
3524 3524
3525 if (tx_seq == chan->expected_tx_seq)
3526 goto expected;
3527
3528 tx_seq_offset = (tx_seq - chan->buffer_seq) % 64; 3525 tx_seq_offset = (tx_seq - chan->buffer_seq) % 64;
3529 if (tx_seq_offset < 0) 3526 if (tx_seq_offset < 0)
3530 tx_seq_offset += 64; 3527 tx_seq_offset += 64;
@@ -3538,6 +3535,9 @@ static inline int l2cap_data_channel_iframe(struct l2cap_chan *chan, u16 rx_cont
3538 if (test_bit(CONN_LOCAL_BUSY, &chan->conn_state)) 3535 if (test_bit(CONN_LOCAL_BUSY, &chan->conn_state))
3539 goto drop; 3536 goto drop;
3540 3537
3538 if (tx_seq == chan->expected_tx_seq)
3539 goto expected;
3540
3541 if (test_bit(CONN_SREJ_SENT, &chan->conn_state)) { 3541 if (test_bit(CONN_SREJ_SENT, &chan->conn_state)) {
3542 struct srej_list *first; 3542 struct srej_list *first;
3543 3543