iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann 2014-07-11 06:19:44 +02:00 committed by Johan Hedberg
parent 6190ae7a18
commit 068d69e5bb
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/bluetooth/sco.h
View File

@ -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;

3
net/bluetooth/sco.c
View File

@ -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;