aboutsummaryrefslogtreecommitdiff
path: root/net/mac802154
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2015-09-24 09:37:11 +0200
committerMarcel Holtmann <marcel@holtmann.org>2015-09-24 20:42:37 +0200
commitc2d5ecfaeafdedfb997a466c654c7029c511f43d (patch)
tree8d510e935c8550fb90c5b47715e2ae46907b91e6 /net/mac802154
parentf856f21dbcd162a53e30987a91d75d5ab54a7f80 (diff)
downloadlinux-stericsson-c2d5ecfaeafdedfb997a466c654c7029c511f43d.tar.gz
mac802154: iface: assume big endian for af_packet
The callback "create" and "parse" from header_ops are called from netdev core upper-layer functionality, like af_packet. These callbacks assumes big endian for addresses and we should not introduce a special byteordering handling for ieee802154 over af_packet in userspace. We have an identical issue with setting the mac address which also assumes big endian byteordering. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/mac802154')
-rw-r--r--net/mac802154/iface.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index b5a0936ce514..3954bcff70e4 100644
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -461,7 +461,7 @@ static int mac802154_header_create(struct sk_buff *skb,
hdr.dest.pan_id = wpan_dev->pan_id;
hdr.dest.mode = IEEE802154_ADDR_LONG;
- memcpy(&hdr.dest.extended_addr, daddr, IEEE802154_EXTENDED_ADDR_LEN);
+ ieee802154_be64_to_le64(&hdr.dest.extended_addr, daddr);
hdr.source.pan_id = hdr.dest.pan_id;
hdr.source.mode = IEEE802154_ADDR_LONG;
@@ -469,8 +469,7 @@ static int mac802154_header_create(struct sk_buff *skb,
if (!saddr)
hdr.source.extended_addr = wpan_dev->extended_addr;
else
- memcpy(&hdr.source.extended_addr, saddr,
- IEEE802154_EXTENDED_ADDR_LEN);
+ ieee802154_be64_to_le64(&hdr.source.extended_addr, saddr);
hlen = ieee802154_hdr_push(skb, &hdr);
if (hlen < 0)
@@ -496,8 +495,7 @@ mac802154_header_parse(const struct sk_buff *skb, unsigned char *haddr)
}
if (hdr.source.mode == IEEE802154_ADDR_LONG) {
- memcpy(haddr, &hdr.source.extended_addr,
- IEEE802154_EXTENDED_ADDR_LEN);
+ ieee802154_le64_to_be64(haddr, &hdr.source.extended_addr);
return IEEE802154_EXTENDED_ADDR_LEN;
}