Bluetooth: Stop ack_timer if ERTM enters in Local Busy or SREJ_SENT

[mv-sheeva.git] / net / bluetooth / l2cap.c

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index c2fb26d9286cad2f779fede33cc9bee4a57d9217..40cf67c11d2026fedd71ed79fd26efcb6ce7b543 100644 (file)
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -3665,6 +3665,8 @@ static int l2cap_push_rx_skb(struct sock *sk, struct sk_buff *skb, u16 control)
 
        pi->conn_state |= L2CAP_CONN_RNR_SENT;
 
+       del_timer(&pi->ack_timer);
+
        queue_work(_busy_wq, &pi->busy_work);
 
        return err;
@@ -3914,6 +3916,8 @@ static inline int l2cap_data_channel_iframe(struct sock *sk, u16 rx_control, str
                pi->conn_state |= L2CAP_CONN_SEND_PBIT;
 
                l2cap_send_srejframe(sk, tx_seq);
+
+               del_timer(&pi->ack_timer);
        }
        return 0;