summaryrefslogtreecommitdiff
path: root/net/mac802154/main.c
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-11-17 10:20:49 +0300
committerMarcel Holtmann <marcel@holtmann.org>2014-11-17 11:49:15 +0300
commit944742a36d784c2a36a141ac10ba5168b0313cec (patch)
tree7a3ef544cfccf772c3e9c24ee9c7d2f4d5f9bb97 /net/mac802154/main.c
parentcd11d935f2df86b6a619e8721553b1d41633f0fd (diff)
downloadlinux-944742a36d784c2a36a141ac10ba5168b0313cec.tar.xz
mac802154: use new nl802154 iftype types
This patch replace the depracted IEEE802154_DEV to the new introduced NL802154_IFTYPE_NODE types. There is a backwards compatibility to have the identical types for both enum definitions. Also remove some inlcude issue with "linux/nl802154.h", because the export nl_policy inside this header it was always necessary to have an include of "net/rtnetlink.h" before. The reason for this is more complicated. Nevertheless we removed this now, because "linux/nl802154.h" is the depracted netlink interface. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/mac802154/main.c')
-rw-r--r--net/mac802154/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index 5199f2115ee9..2e42fc2e430c 100644
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -19,7 +19,7 @@
#include <linux/netdevice.h>
#include <net/netlink.h>
-#include <linux/nl802154.h>
+#include <net/nl802154.h>
#include <net/mac802154.h>
#include <net/ieee802154_netdev.h>
#include <net/route.h>
@@ -161,7 +161,7 @@ int ieee802154_register_hw(struct ieee802154_hw *hw)
rtnl_lock();
- dev = ieee802154_if_add(local, "wpan%d", NULL, IEEE802154_DEV_WPAN);
+ dev = ieee802154_if_add(local, "wpan%d", NULL, NL802154_IFTYPE_NODE);
if (IS_ERR(dev)) {
rtnl_unlock();
rc = PTR_ERR(dev);