The patch titled
rfcomm endianness annotations
has been added to the -mm tree. Its filename is
rfcomm-endianness-annotations.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: rfcomm endianness annotations
From: Al Viro <viro@xxxxxxxxxxxxxxxx>
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Acked-by: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/net/bluetooth/rfcomm.h | 4 ++--
net/bluetooth/rfcomm/core.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff -puN include/net/bluetooth/rfcomm.h~rfcomm-endianness-annotations include/net/bluetooth/rfcomm.h
--- a/include/net/bluetooth/rfcomm.h~rfcomm-endianness-annotations
+++ a/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 -puN net/bluetooth/rfcomm/core.c~rfcomm-endianness-annotations net/bluetooth/rfcomm/core.c
--- a/net/bluetooth/rfcomm/core.c~rfcomm-endianness-annotations
+++ a/net/bluetooth/rfcomm/core.c
@@ -1018,7 +1018,7 @@ static void rfcomm_make_uih(struct sk_bu
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);
_
Patches currently in -mm which might be from viro@xxxxxxxxxxxxxxxx are
git-netdev-all.patch
bnep-endianness-bug-filtering-by-packet-type.patch
bnep-endianness-annotations.patch
rfcomm-endianness-annotations.patch
rfcomm-endianness-bug-param_mask-is-little-endian-on-the-wire.patch
slab-leaks3-default-y.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
