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

Commit 068d69e5 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Move SCO timeout constants into net/bluetooth/sco.c 



There is no external user of the SCO timeout constants and thus
move them into net/bluetooth/sco.c where they are actuallu used.

In addition just remove SCO_CONN_IDLE_TIMEOUT since it is unused.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 6190ae7a

include/net/bluetooth/sco.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -28,10 +28,6 @@ 
/* SCO defaults */

/* SCO defaults */

#define SCO_DEFAULT_MTU		500

#define SCO_DEFAULT_MTU		500





#define SCO_CONN_TIMEOUT	(HZ * 40)

#define SCO_DISCONN_TIMEOUT	(HZ * 2)

#define SCO_CONN_IDLE_TIMEOUT	(HZ * 60)



/* SCO socket address */

/* SCO socket address */

struct sockaddr_sco {

struct sockaddr_sco {

	sa_family_t	sco_family;

	sa_family_t	sco_family;

net/bluetooth/sco.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -72,6 +72,9 @@ struct sco_pinfo { 
};

};





/* ---- SCO timers ---- */

/* ---- SCO timers ---- */

#define SCO_CONN_TIMEOUT	(HZ * 40)

#define SCO_DISCONN_TIMEOUT	(HZ * 2)



static void sco_sock_timeout(unsigned long arg)

static void sco_sock_timeout(unsigned long arg)

{

{

	struct sock *sk = (struct sock *) arg;

	struct sock *sk = (struct sock *) arg;