diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2014-07-11 00:19:44 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-07-11 06:58:58 -0400 |
commit | 068d69e5bbd85291aa8ad0d81062f047609a173c (patch) | |
tree | 2d8f07bf4b75d6806871bc23e1ccc0646d8056b3 | |
parent | 6190ae7a184bf488aeb051a5713aa57b07d4c59b (diff) |
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: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
-rw-r--r-- | include/net/bluetooth/sco.h | 4 | ||||
-rw-r--r-- | net/bluetooth/sco.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/net/bluetooth/sco.h b/include/net/bluetooth/sco.h index ab8b1ed550d2..f40ddb4264fc 100644 --- a/include/net/bluetooth/sco.h +++ b/include/net/bluetooth/sco.h | |||
@@ -28,10 +28,6 @@ | |||
28 | /* SCO defaults */ | 28 | /* SCO defaults */ |
29 | #define SCO_DEFAULT_MTU 500 | 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 | /* SCO socket address */ | 31 | /* SCO socket address */ |
36 | struct sockaddr_sco { | 32 | struct sockaddr_sco { |
37 | sa_family_t sco_family; | 33 | sa_family_t sco_family; |
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 9868ec7c7dc4..e6c7b636b901 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c | |||
@@ -72,6 +72,9 @@ struct sco_pinfo { | |||
72 | }; | 72 | }; |
73 | 73 | ||
74 | /* ---- SCO timers ---- */ | 74 | /* ---- SCO timers ---- */ |
75 | #define SCO_CONN_TIMEOUT (HZ * 40) | ||
76 | #define SCO_DISCONN_TIMEOUT (HZ * 2) | ||
77 | |||
75 | static void sco_sock_timeout(unsigned long arg) | 78 | static void sco_sock_timeout(unsigned long arg) |
76 | { | 79 | { |
77 | struct sock *sk = (struct sock *) arg; | 80 | struct sock *sk = (struct sock *) arg; |