Merge tag 'stable/for-linus-3.6-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / include / linux / nl802154.h

diff --git a/include/linux/nl802154.h b/include/linux/nl802154.h
index 5a3db3aa5f17425587411e26ed1736cb92a6a5c4..fd4f2d1cdf6cbfd95a3dd9eba2c10b27eca9d062 100644 (file)
--- a/include/linux/nl802154.h
+++ b/include/linux/nl802154.h
@@ -130,18 +130,8 @@ enum {
 enum {
        __IEEE802154_DEV_INVALID = -1,
 
-        /* TODO:
-        * Nowadays three device types supported by this stack at linux-zigbee
-        * project: WPAN = 0, MONITOR = 1 and SMAC = 2.
-        *
-        * Since this stack implementation exists many years, it's definitely
-        * bad idea to change the assigned values due to they are already used
-        * by third-party userspace software like: iz-tools, wireshark...
-        *
-        * Currently only monitor device is added and initialized by '1' for
-        * compatibility.
-        */
-       IEEE802154_DEV_MONITOR = 1,
+       IEEE802154_DEV_WPAN,
+       IEEE802154_DEV_MONITOR,
 
        __IEEE802154_DEV_MAX,
 };