Move source tree closer to the 2.6.32.17 mainline
/include/net/bluetooth/rfcomm.h
blob:c274993234e32dc8c6ea88b7d61e0f332227e6cb -> blob:921d7b3c7f8d2098e6390d3d60195628cae55fc1
--- include/net/bluetooth/rfcomm.h
+++ include/net/bluetooth/rfcomm.h
@@ -29,6 +29,7 @@
#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
@@ -154,6 +155,7 @@ 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;