Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[cascardo/linux.git] / include / net / bluetooth / rfcomm.h

diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h
index bbfac86..3c563f0 100644 (file)
--- a/include/net/bluetooth/rfcomm.h
+++ b/include/net/bluetooth/rfcomm.h
@@ -33,7 +33,7 @@
 #define RFCOMM_DEFAULT_MTU     127
 #define RFCOMM_DEFAULT_CREDITS 7
 
-#define RFCOMM_MAX_L2CAP_MTU   1024
+#define RFCOMM_MAX_L2CAP_MTU   1013
 #define RFCOMM_MAX_CREDITS     40
 
 #define RFCOMM_SKB_HEAD_RESERVE        8
@@ -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 {