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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Marcel Holtmann and committed by

Johan Hedberg 11 years ago 068d69e5 6190ae7a

+3 -4

2 changed files

expand all

include

net

bluetooth

sco.h

net

bluetooth

sco.c

-4

include/net/bluetooth/sco.h

··· 28 28 /* SCO defaults */ 29 29 #define SCO_DEFAULT_MTU 500 30 30 31 - #define SCO_CONN_TIMEOUT (HZ * 40) 32 - #define SCO_DISCONN_TIMEOUT (HZ * 2) 33 - #define SCO_CONN_IDLE_TIMEOUT (HZ * 60) 34 - 35 31 /* SCO socket address */ 36 32 struct sockaddr_sco { 37 33 sa_family_t sco_family;

net/bluetooth/sco.c

··· 72 72 }; 73 73 74 74 /* ---- SCO timers ---- */ 75 + #define SCO_CONN_TIMEOUT (HZ * 40) 76 + #define SCO_DISCONN_TIMEOUT (HZ * 2) 77 + 75 78 static void sco_sock_timeout(unsigned long arg) 76 79 { 77 80 struct sock *sk = (struct sock *) arg;