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>

diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index b5a0936ce514eaa2706a036d715ad28427a9d2ae..3954bcff70e4ac1e45da28ffdd4f469d1149016f 100644 (file)
--- 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;
        }