aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-10-25 09:41:04 +0200
committerMarcel Holtmann <marcel@holtmann.org>2014-10-25 21:39:57 +0200
commit4ca24aca55fe1e2a61f3ffaac9015d9c45204729 (patch)
treee3b263954c1a572bd683763cab9bc37688bcc2c6 /include
parentieee802154: move wpan-class.c to core.c (diff)
downloadlinux-dev-4ca24aca55fe1e2a61f3ffaac9015d9c45204729.tar.xz
linux-dev-4ca24aca55fe1e2a61f3ffaac9015d9c45204729.zip
ieee802154: move ieee802154 header
This patch moves the ieee802154 header into include/linux instead include/net. Similar like wireless which have the ieee80211 header inside of include/linux. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Cc: Alan Ott <alan@signal11.us> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ieee802154.h (renamed from include/net/ieee802154.h)8
-rw-r--r--include/net/ieee802154_netdev.h2
2 files changed, 4 insertions, 6 deletions
diff --git a/include/net/ieee802154.h b/include/linux/ieee802154.h
index 4db4e320b2f5..2dfab2db103a 100644
--- a/include/net/ieee802154.h
+++ b/include/linux/ieee802154.h
@@ -20,8 +20,8 @@
* Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
*/
-#ifndef NET_IEEE802154_H
-#define NET_IEEE802154_H
+#ifndef LINUX_IEEE802154_H
+#define LINUX_IEEE802154_H
#define IEEE802154_MTU 127
@@ -186,6 +186,4 @@ enum {
};
-#endif
-
-
+#endif /* LINUX_IEEE802154_H */
diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h
index f87420689d70..5e62d758eea5 100644
--- a/include/net/ieee802154_netdev.h
+++ b/include/net/ieee802154_netdev.h
@@ -23,10 +23,10 @@
#ifndef IEEE802154_NETDEVICE_H
#define IEEE802154_NETDEVICE_H
-#include <net/ieee802154.h>
#include <net/af_ieee802154.h>
#include <linux/netdevice.h>
#include <linux/skbuff.h>
+#include <linux/ieee802154.h>
struct ieee802154_sechdr {
#if defined(__LITTLE_ENDIAN_BITFIELD)