diff options
author | Alexander Aring <alex.aring@gmail.com> | 2014-11-05 14:51:28 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-11-05 15:53:06 -0500 |
commit | e57a8946847148560114a8deb8e9fad0112530b2 (patch) | |
tree | c654b2f088be84f8b2ce1c39c73afa3dfd06f3b9 /net/mac802154 | |
parent | 05e3f2f351d3c6f19a81ff7eb0a661ffcd4b19b7 (diff) |
mac802154: use IEEE802154_EXTENDED_ADDR_LEN
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>
Diffstat (limited to 'net/mac802154')
-rw-r--r-- | net/mac802154/iface.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c index 97e5bed9f917..51abe05a6aab 100644 --- a/net/mac802154/iface.c +++ b/net/mac802154/iface.c | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | #include <net/rtnetlink.h> | 25 | #include <net/rtnetlink.h> |
26 | #include <linux/nl802154.h> | 26 | #include <linux/nl802154.h> |
27 | #include <net/af_ieee802154.h> | ||
28 | #include <net/mac802154.h> | 27 | #include <net/mac802154.h> |
29 | #include <net/ieee802154_netdev.h> | 28 | #include <net/ieee802154_netdev.h> |
30 | #include <net/cfg802154.h> | 29 | #include <net/cfg802154.h> |
@@ -384,8 +383,8 @@ static void mac802154_wpan_free(struct net_device *dev) | |||
384 | 383 | ||
385 | static void ieee802154_if_setup(struct net_device *dev) | 384 | static void ieee802154_if_setup(struct net_device *dev) |
386 | { | 385 | { |
387 | dev->addr_len = IEEE802154_ADDR_LEN; | 386 | dev->addr_len = IEEE802154_EXTENDED_ADDR_LEN; |
388 | memset(dev->broadcast, 0xff, IEEE802154_ADDR_LEN); | 387 | memset(dev->broadcast, 0xff, IEEE802154_EXTENDED_ADDR_LEN); |
389 | 388 | ||
390 | dev->hard_header_len = MAC802154_FRAME_HARD_HEADER_LEN; | 389 | dev->hard_header_len = MAC802154_FRAME_HARD_HEADER_LEN; |
391 | dev->needed_tailroom = 2 + 16; /* FCS + MIC */ | 390 | dev->needed_tailroom = 2 + 16; /* FCS + MIC */ |