]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
mac802154: use IEEE802154_EXTENDED_ADDR_LEN
authorAlexander Aring <alex.aring@gmail.com>
Wed, 5 Nov 2014 19:51:28 +0000 (20:51 +0100)
committerMarcel Holtmann <marcel@holtmann.org>
Wed, 5 Nov 2014 20:53:06 +0000 (21:53 +0100)
This patch removes the af_ieee802154 defines and use the
IEEE802154_EXTENDED_ADDR_LEN. We should do this everywhere in the
802.15.4 subsystem because af_ieee802154 should be normally an uapi
header.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/mac802154/iface.c

index 97e5bed9f91726682338044d440f5b88cc7b228d..51abe05a6aabcf7d5a846a9623350d052aa9c323 100644 (file)
@@ -24,7 +24,6 @@
 
 #include <net/rtnetlink.h>
 #include <linux/nl802154.h>
-#include <net/af_ieee802154.h>
 #include <net/mac802154.h>
 #include <net/ieee802154_netdev.h>
 #include <net/cfg802154.h>
@@ -384,8 +383,8 @@ static void mac802154_wpan_free(struct net_device *dev)
 
 static void ieee802154_if_setup(struct net_device *dev)
 {
-       dev->addr_len           = IEEE802154_ADDR_LEN;
-       memset(dev->broadcast, 0xff, IEEE802154_ADDR_LEN);
+       dev->addr_len           = IEEE802154_EXTENDED_ADDR_LEN;
+       memset(dev->broadcast, 0xff, IEEE802154_EXTENDED_ADDR_LEN);
 
        dev->hard_header_len    = MAC802154_FRAME_HARD_HEADER_LEN;
        dev->needed_tailroom    = 2 + 16; /* FCS + MIC */