[Bluetooth] Disable disconnect timer during Simple Pairing

[pandora-kernel.git] / include / net / bluetooth / rfcomm.h

diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h
index 89d743c..8c54ff3 100644 (file)
--- a/include/net/bluetooth/rfcomm.h
+++ b/include/net/bluetooth/rfcomm.h
@@ -124,7 +124,7 @@ struct rfcomm_pn {
        u8  flow_ctrl;
        u8  priority;
        u8  ack_timer;
-       u16 mtu;
+       __le16 mtu;
        u8  max_retrans;
        u8  credits;
 } __attribute__ ((packed));
@@ -136,7 +136,7 @@ struct rfcomm_rpn {
        u8  flow_ctrl;
        u8  xon_char;
        u8  xoff_char;
-       u16 param_mask;
+       __le16 param_mask;
 } __attribute__ ((packed));
 
 struct rfcomm_rls {
@@ -181,6 +181,7 @@ struct rfcomm_dlc {
        u8            priority;
        u8            v24_sig;
        u8            mscex;
+       u8            out;
 
        u32           link_mode;
 
@@ -252,8 +253,8 @@ static inline void rfcomm_dlc_put(struct rfcomm_dlc *d)
                rfcomm_dlc_free(d);
 }
 
-extern void FASTCALL(__rfcomm_dlc_throttle(struct rfcomm_dlc *d));
-extern void FASTCALL(__rfcomm_dlc_unthrottle(struct rfcomm_dlc *d));
+extern void __rfcomm_dlc_throttle(struct rfcomm_dlc *d);
+extern void __rfcomm_dlc_unthrottle(struct rfcomm_dlc *d);
 
 static inline void rfcomm_dlc_throttle(struct rfcomm_dlc *d)
 {
@@ -323,6 +324,7 @@ int  rfcomm_connect_ind(struct rfcomm_session *s, u8 channel, struct rfcomm_dlc
 #define RFCOMM_RELEASE_ONHUP  1
 #define RFCOMM_HANGUP_NOW     2
 #define RFCOMM_TTY_ATTACHED   3
+#define RFCOMM_TTY_RELEASED   4
 
 struct rfcomm_dev_req {
        s16      dev_id;