ieee802154: remove unnecessary includes
Subsystems (2)
Alexander Aring
maintainerPATCH 1/2 ieee802154: remove unnecessary includes
This patch removes some unnecessary includes from ieee802154 header, which was introduced by commit b609fb54adfa ("ieee802154: add helpers for frame control checks").
--- include/linux/ieee802154.h | 3 --- 1 file changed, 3 deletions(-)
include/linux/ieee802154.h +0 -3
@@ -25,9 +25,6 @@#include <linux/types.h> #include <linux/random.h> -#include <linux/skbuff.h> -#include <linux/unaligned/memmove.h> -#include <asm/byteorder.h> #define IEEE802154_MTU 127#define IEEE802154_ACK_PSDU_LEN 5
Signature · 1 line
2.5.2
Alexander Aring
maintainerPATCH 2/2 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.
--- net/mac802154/iface.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
net/mac802154/iface.c +3 -5
@@ -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 ; }
Signature · 1 line
2.5.2
Re: [PATCH bluetooth-next 2/2] mac802154: iface: assume big endian for af_packet
Hi Alex,
Quoted 5 lines
The callback "create" and "parse" from
header_opsare called from netdev core upper-layer functionality, likeaf_packet. These callbacks assumes big endian for addresses and we should not introduce a special byteordering handling for ieee802154 overaf_packetin userspace.
Quoted 7 lines
We have an identical issue with setting the mac address which also assumes big endian byteordering.
Signed-off-by Alexander Aring <[email protected]>---
net/mac802154/iface.c| 8 +++-----1 file changed, 3 insertions(+), 5 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel
Hi Alex,
Quoted 8 lines
This patch removes some unnecessary includes from ieee802154 header, which was introduced by commit
b609fb54adfa("ieee802154: add helpers for frame control checks").Signed-off-by Alexander Aring <[email protected]>---
include/linux/ieee802154.h| 3 ---1 file changed, 3 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel