1 files changed, 2 insertions, 1 deletions

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 9ef01c32b3a2..ba49f9a3579e 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -3379,6 +3379,8 @@ static inline void l2cap_send_i_or_rr_or_rnr(struct sock *sk)
         if (pi->conn_state & L2CAP_CONN_REMOTE_BUSY && pi->unacked_frames > 0)
                 __mod_retrans_timer();
 
+        pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
+
         spin_lock_bh(&pi->send_lock);
         l2cap_ertm_send(sk);
         spin_unlock_bh(&pi->send_lock);
@@ -3936,7 +3938,6 @@ static inline void l2cap_data_channel_rrframe(struct sock *sk, u16 rx_control)
                         l2cap_send_srejtail(sk);
                 } else {
                         l2cap_send_i_or_rr_or_rnr(sk);
-                        pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
                 }
 
         } else if (rx_control & L2CAP_CTRL_FINAL) {