diff options
author | Alexander Aring <alex.aring@gmail.com> | 2014-10-25 07:41:04 (GMT) |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-10-25 19:39:57 (GMT) |
commit | 4ca24aca55fe1e2a61f3ffaac9015d9c45204729 (patch) | |
tree | e3b263954c1a572bd683763cab9bc37688bcc2c6 | |
parent | 86d52cd96414f05c4053fb264a85309772c6ae26 (diff) | |
download | linux-4ca24aca55fe1e2a61f3ffaac9015d9c45204729.tar.xz |
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>
-rw-r--r-- | drivers/net/ieee802154/at86rf230.c | 2 | ||||
-rw-r--r-- | drivers/net/ieee802154/cc2520.c | 2 | ||||
-rw-r--r-- | drivers/net/ieee802154/fakehard.c | 2 | ||||
-rw-r--r-- | drivers/net/ieee802154/mrf24j40.c | 2 | ||||
-rw-r--r-- | include/linux/ieee802154.h (renamed from include/net/ieee802154.h) | 8 | ||||
-rw-r--r-- | include/net/ieee802154_netdev.h | 2 | ||||
-rw-r--r-- | net/ieee802154/6lowpan_rtnl.c | 2 | ||||
-rw-r--r-- | net/ieee802154/dgram.c | 2 | ||||
-rw-r--r-- | net/ieee802154/header_ops.c | 3 | ||||
-rw-r--r-- | net/ieee802154/nl-mac.c | 2 | ||||
-rw-r--r-- | net/mac802154/iface.c | 2 | ||||
-rw-r--r-- | net/mac802154/llsec.c | 2 | ||||
-rw-r--r-- | net/mac802154/mac_cmd.c | 2 | ||||
-rw-r--r-- | net/mac802154/monitor.c | 2 |
14 files changed, 17 insertions, 18 deletions
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c index 795ac11..a433d20 100644 --- a/drivers/net/ieee802154/at86rf230.c +++ b/drivers/net/ieee802154/at86rf230.c @@ -29,8 +29,8 @@ #include <linux/regmap.h> #include <linux/skbuff.h> #include <linux/of_gpio.h> +#include <linux/ieee802154.h> -#include <net/ieee802154.h> #include <net/mac802154.h> #include <net/cfg802154.h> diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c index f1770cf..32b3c88 100644 --- a/drivers/net/ieee802154/cc2520.c +++ b/drivers/net/ieee802154/cc2520.c @@ -21,10 +21,10 @@ #include <linux/skbuff.h> #include <linux/pinctrl/consumer.h> #include <linux/of_gpio.h> +#include <linux/ieee802154.h> #include <net/mac802154.h> #include <net/cfg802154.h> -#include <net/ieee802154.h> #define SPI_COMMAND_BUFFER 3 #define HIGH 1 diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c index 1460bf5..8be05ad 100644 --- a/drivers/net/ieee802154/fakehard.c +++ b/drivers/net/ieee802154/fakehard.c @@ -25,10 +25,10 @@ #include <linux/netdevice.h> #include <linux/skbuff.h> #include <linux/if_arp.h> +#include <linux/ieee802154.h> #include <net/af_ieee802154.h> #include <net/ieee802154_netdev.h> -#include <net/ieee802154.h> #include <net/nl802154.h> #include <net/cfg802154.h> diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c index bea7349..56a6959 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c @@ -18,9 +18,9 @@ #include <linux/spi/spi.h> #include <linux/interrupt.h> #include <linux/module.h> +#include <linux/ieee802154.h> #include <net/cfg802154.h> #include <net/mac802154.h> -#include <net/ieee802154.h> /* MRF24J40 Short Address Registers */ #define REG_RXMCR 0x00 /* Receive MAC control */ diff --git a/include/net/ieee802154.h b/include/linux/ieee802154.h index 4db4e32..2dfab2d 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 f874206..5e62d75 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) diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c index 0c1a49b..1779a08 100644 --- a/net/ieee802154/6lowpan_rtnl.c +++ b/net/ieee802154/6lowpan_rtnl.c @@ -49,8 +49,8 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/netdevice.h> +#include <linux/ieee802154.h> #include <net/af_ieee802154.h> -#include <net/ieee802154.h> #include <net/ieee802154_netdev.h> #include <net/6lowpan.h> #include <net/ipv6.h> diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c index 71e99a0..3d58bef 100644 --- a/net/ieee802154/dgram.c +++ b/net/ieee802154/dgram.c @@ -23,9 +23,9 @@ #include <linux/if_arp.h> #include <linux/list.h> #include <linux/slab.h> +#include <linux/ieee802154.h> #include <net/sock.h> #include <net/af_ieee802154.h> -#include <net/ieee802154.h> #include <net/ieee802154_netdev.h> #include <asm/ioctls.h> diff --git a/net/ieee802154/header_ops.c b/net/ieee802154/header_ops.c index c09294e..a051b69 100644 --- a/net/ieee802154/header_ops.c +++ b/net/ieee802154/header_ops.c @@ -14,8 +14,9 @@ * Phoebe Buckheister <phoebe.buckheister@itwm.fraunhofer.de> */ +#include <linux/ieee802154.h> + #include <net/mac802154.h> -#include <net/ieee802154.h> #include <net/ieee802154_netdev.h> static int diff --git a/net/ieee802154/nl-mac.c b/net/ieee802154/nl-mac.c index a9c8e3e..fb6866d 100644 --- a/net/ieee802154/nl-mac.c +++ b/net/ieee802154/nl-mac.c @@ -22,6 +22,7 @@ #include <linux/kernel.h> #include <linux/if_arp.h> #include <linux/netdevice.h> +#include <linux/ieee802154.h> #include <net/netlink.h> #include <net/genetlink.h> #include <net/sock.h> @@ -29,7 +30,6 @@ #include <linux/export.h> #include <net/af_ieee802154.h> #include <net/nl802154.h> -#include <net/ieee802154.h> #include <net/ieee802154_netdev.h> #include <net/cfg802154.h> diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c index 5a60407..03eedc3 100644 --- a/net/mac802154/iface.c +++ b/net/mac802154/iface.c @@ -20,13 +20,13 @@ #include <linux/netdevice.h> #include <linux/module.h> #include <linux/if_arp.h> +#include <linux/ieee802154.h> #include <net/rtnetlink.h> #include <linux/nl802154.h> #include <net/af_ieee802154.h> #include <net/mac802154.h> #include <net/ieee802154_netdev.h> -#include <net/ieee802154.h> #include <net/cfg802154.h> #include "ieee802154_i.h" diff --git a/net/mac802154/llsec.c b/net/mac802154/llsec.c index 26f8761..fa0d523 100644 --- a/net/mac802154/llsec.c +++ b/net/mac802154/llsec.c @@ -17,7 +17,7 @@ #include <linux/err.h> #include <linux/bug.h> #include <linux/completion.h> -#include <net/ieee802154.h> +#include <linux/ieee802154.h> #include <crypto/algapi.h> #include "ieee802154_i.h" diff --git a/net/mac802154/mac_cmd.c b/net/mac802154/mac_cmd.c index f118ea0..ad09d54 100644 --- a/net/mac802154/mac_cmd.c +++ b/net/mac802154/mac_cmd.c @@ -20,8 +20,8 @@ #include <linux/skbuff.h> #include <linux/if_arp.h> +#include <linux/ieee802154.h> -#include <net/ieee802154.h> #include <net/ieee802154_netdev.h> #include <net/cfg802154.h> #include <net/mac802154.h> diff --git a/net/mac802154/monitor.c b/net/mac802154/monitor.c index ca1dedd..ca82c72 100644 --- a/net/mac802154/monitor.c +++ b/net/mac802154/monitor.c @@ -21,8 +21,8 @@ #include <linux/skbuff.h> #include <linux/if_arp.h> #include <linux/crc-ccitt.h> +#include <linux/ieee802154.h> -#include <net/ieee802154.h> #include <net/mac802154.h> #include <net/netlink.h> #include <net/cfg802154.h> |