[PATCH net-next 3/4] 6lowpan: the two bytes of u16 tag needs to be stored/accessed the other way around
From: Tony Cheneau <hidden>
Date: 2012-06-11 04:46:33
Subsystem:
ieee 802.15.4 subsystem, networking [general], the rest · Maintainers:
Alexander Aring, Stefan Schmidt, Miquel Raynal, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Or else, tag values, as displayed with a trafic analyser, such a Wireshark, are not properly displayed (e.g. 0x01 00 insted of 0x00 01, and so on). --- net/ieee802154/6lowpan.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
index af4f29b..af2f12e 100644
--- a/net/ieee802154/6lowpan.c
+++ b/net/ieee802154/6lowpan.c@@ -307,7 +307,7 @@ static u16 lowpan_fetch_skb_u16(struct sk_buff *skb) BUG_ON(!pskb_may_pull(skb, 2)); - ret = skb->data[0] | (skb->data[1] << 8); + ret = (skb->data[0] << 8) | skb->data[1]; skb_pull(skb, 2); return ret; }
@@ -1002,8 +1002,8 @@ lowpan_skb_fragmentation(struct sk_buff *skb) /* first fragment header */ head[0] = LOWPAN_DISPATCH_FRAG1 | (payload_length & 0x7); head[1] = (payload_length >> 3) & 0xff; - head[2] = tag & 0xff; - head[3] = tag >> 8; + head[2] = tag >> 8; + head[3] = tag & 0xff; err = lowpan_fragment_xmit(skb, head, header_length, 0, 0);
--
1.7.3.4