Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb02a255 authored by Dean Jenkins's avatar Dean Jenkins Committed by Marcel Holtmann
Browse files

Bluetooth: __l2cap_wait_ack() use msecs_to_jiffies() 



Use msecs_to_jiffies() instead of using HZ so that it
is easier to specify the time in milliseconds.

Also add a #define L2CAP_WAIT_ACK_POLL_PERIOD to specify the 200ms
polling period so that it is defined in a single place.

Signed-off-by: default avatarDean Jenkins <Dean_Jenkins@mentor.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 451e4c6c

include/net/bluetooth/l2cap.h

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#define L2CAP_INFO_TIMEOUT		msecs_to_jiffies(4000)

#define L2CAP_MOVE_TIMEOUT		msecs_to_jiffies(4000)

#define L2CAP_MOVE_ERTX_TIMEOUT		msecs_to_jiffies(60000)

#define L2CAP_WAIT_ACK_POLL_PERIOD	msecs_to_jiffies(200)



#define L2CAP_A2MP_DEFAULT_MTU		670

net/bluetooth/l2cap_sock.c

+2 −2
Original line number Diff line number Diff line
@@ -1058,7 +1058,7 @@ static int __l2cap_wait_ack(struct sock *sk, struct l2cap_chan *chan) 
{

	DECLARE_WAITQUEUE(wait, current);

	int err = 0;

	int timeo = HZ/5;

	int timeo = L2CAP_WAIT_ACK_POLL_PERIOD;



	add_wait_queue(sk_sleep(sk), &wait);

	set_current_state(TASK_INTERRUPTIBLE);
@@ -1066,7 +1066,7 @@ static int __l2cap_wait_ack(struct sock *sk, struct l2cap_chan *chan) 
		BT_DBG("Waiting for %d ACKs", chan->unacked_frames);



		if (!timeo)

			timeo = HZ/5;

			timeo = L2CAP_WAIT_ACK_POLL_PERIOD;



		if (signal_pending(current)) {

			err = sock_intr_errno(timeo);