From 2b55882455d17ce8eb25533215690e5112fd47d4 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 8 Nov 2006 00:28:19 -0800
Subject: [PATCH] --- yaml --- r: 41591 b: refs/heads/master c:
 6ba9c755e5f044c6a37296481bf6a861e4193a37 h: refs/heads/master i:   41589:
 c242b7cd1537a0c6b5e81fb7c346c99b24eb854e   41587:
 1aeacea6233551b77d090177a7973a44b7507085   41583:
 d3232d726cb31b7c6559ae1d0995a5e8d00d8440 v: v3

---
 [refs]                               | 2 +-
 trunk/include/net/bluetooth/rfcomm.h | 4 ++--
 trunk/net/bluetooth/rfcomm/core.c    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8772d9a4b7c0..847ee2cb9bb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bc5d4483a83349f143e2bbf23ec144cd7e21e89
+refs/heads/master: 6ba9c755e5f044c6a37296481bf6a861e4193a37
diff --git a/trunk/include/net/bluetooth/rfcomm.h b/trunk/include/net/bluetooth/rfcomm.h
index 89d743cfdfdf..3c563f02907c 100644
--- a/trunk/include/net/bluetooth/rfcomm.h
+++ b/trunk/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 {
diff --git a/trunk/net/bluetooth/rfcomm/core.c b/trunk/net/bluetooth/rfcomm/core.c
index ddc4e9d5963e..f3e5b7e2e04c 100644
--- a/trunk/net/bluetooth/rfcomm/core.c
+++ b/trunk/net/bluetooth/rfcomm/core.c
@@ -1018,7 +1018,7 @@ static void rfcomm_make_uih(struct sk_buff *skb, u8 addr)
 
 	if (len > 127) {
 		hdr = (void *) skb_push(skb, 4);
-		put_unaligned(htobs(__len16(len)), (u16 *) &hdr->len);
+		put_unaligned(htobs(__len16(len)), (__le16 *) &hdr->len);
 	} else {
 		hdr = (void *) skb_push(skb, 3);
 		hdr->len = __len8(len);