diff options
| author | Nick Pelly <npelly@google.com> | 2010-02-17 20:45:48 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-09-29 17:49:28 -0700 |
| commit | 07c478e4d54216222c4fa3a2e9abff072f01854c (patch) | |
| tree | 23365e08c97e845a202fa657aa5a8e4cc42a0db6 /include/net | |
| parent | 565e9273ae1ed5c194300822e21c95b7b70f2c8c (diff) | |
Revert "Bluetooth: Fix rejected connection not disconnecting ACL link"
This reverts commit 9e726b17422bade75fba94e625cd35fd1353e682.
Change-Id: I3bc2e4caa2a0e0c36b9c7de4a09b03276adae4e1
Signed-off-by: Nick Pelly <npelly@google.com>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/rfcomm.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h index a140847d622c..76937710e516 100644 --- a/include/net/bluetooth/rfcomm.h +++ b/include/net/bluetooth/rfcomm.h @@ -29,7 +29,6 @@ #define RFCOMM_CONN_TIMEOUT (HZ * 30) #define RFCOMM_DISC_TIMEOUT (HZ * 20) #define RFCOMM_AUTH_TIMEOUT (HZ * 25) -#define RFCOMM_IDLE_TIMEOUT (HZ * 2) #define RFCOMM_DEFAULT_MTU 127 #define RFCOMM_DEFAULT_CREDITS 7 @@ -155,7 +154,6 @@ struct rfcomm_msc { struct rfcomm_session { struct list_head list; struct socket *sock; - struct timer_list timer; unsigned long state; unsigned long flags; atomic_t refcnt; |