From ce1c698ea8a242f386d03f236fac1af4f0e83495 Mon Sep 17 00:00:00 2001 From: Nick Pelly Date: Wed, 17 Feb 2010 20:45:48 -0800 Subject: Revert "Bluetooth: Fix rejected connection not disconnecting ACL link" This reverts commit 9e726b17422bade75fba94e625cd35fd1353e682. Change-Id: I3bc2e4caa2a0e0c36b9c7de4a09b03276adae4e1 Signed-off-by: Nick Pelly --- include/net/bluetooth/rfcomm.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h index 921d7b3c7f8d..c274993234e3 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; -- cgit v1.2.3