From: Alexander Aring <alex.aring@gmail.com>
To: linux-wpan@vger.kernel.org
Cc: kernel@pengutronix.de, Alexander Aring <alex.aring@gmail.com>
Subject: [PATCH bluetooth-next 2/7] mac802154: move mac802154.h to ieee802154_i.h
Date: Sat, 25 Oct 2014 09:25:00 +0200 [thread overview]
Message-ID: <1414221905-19422-3-git-send-email-alex.aring@gmail.com> (raw)
In-Reply-To: <1414221905-19422-1-git-send-email-alex.aring@gmail.com>
This patch moves the mac802154.h internal header to ieee802154_i.h like
the wireless stack ieee80211_i.h file. This avoids confusing with the
not internal header include/net/mac802154.h header. Additional we get
the same naming conversion like mac80211 for this file.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
net/mac802154/{mac802154.h => ieee802154_i.h} | 6 +++---
net/mac802154/llsec.c | 2 +-
net/mac802154/mac_cmd.c | 2 +-
net/mac802154/main.c | 2 +-
net/mac802154/mib.c | 2 +-
net/mac802154/monitor.c | 2 +-
net/mac802154/rx.c | 2 +-
net/mac802154/tx.c | 2 +-
net/mac802154/wpan.c | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
rename net/mac802154/{mac802154.h => ieee802154_i.h} (98%)
diff --git a/net/mac802154/mac802154.h b/net/mac802154/ieee802154_i.h
similarity index 98%
rename from net/mac802154/mac802154.h
rename to net/mac802154/ieee802154_i.h
index e3503c1..970b621 100644
--- a/net/mac802154/mac802154.h
+++ b/net/mac802154/ieee802154_i.h
@@ -16,8 +16,8 @@
* Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
* Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
*/
-#ifndef MAC802154_H
-#define MAC802154_H
+#ifndef __IEEE802154_I_H
+#define __IEEE802154_I_H
#include <linux/mutex.h>
#include <net/mac802154.h>
@@ -165,4 +165,4 @@ void mac802154_get_table(struct net_device *dev,
struct ieee802154_llsec_table **t);
void mac802154_unlock_table(struct net_device *dev);
-#endif /* MAC802154_H */
+#endif /* __IEEE802154_I_H */
diff --git a/net/mac802154/llsec.c b/net/mac802154/llsec.c
index 4570581..26f8761 100644
--- a/net/mac802154/llsec.c
+++ b/net/mac802154/llsec.c
@@ -20,7 +20,7 @@
#include <net/ieee802154.h>
#include <crypto/algapi.h>
-#include "mac802154.h"
+#include "ieee802154_i.h"
#include "llsec.h"
static void llsec_key_put(struct mac802154_llsec_key *key);
diff --git a/net/mac802154/mac_cmd.c b/net/mac802154/mac_cmd.c
index 85f70ed..7c4b05b 100644
--- a/net/mac802154/mac_cmd.c
+++ b/net/mac802154/mac_cmd.c
@@ -27,7 +27,7 @@
#include <net/mac802154.h>
#include <net/nl802154.h>
-#include "mac802154.h"
+#include "ieee802154_i.h"
static int mac802154_mlme_start_req(struct net_device *dev,
struct ieee802154_addr *addr,
diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index 086d4a9..d11e42a 100644
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -27,7 +27,7 @@
#include <net/route.h>
#include <net/wpan-phy.h>
-#include "mac802154.h"
+#include "ieee802154_i.h"
int mac802154_slave_open(struct net_device *dev)
{
diff --git a/net/mac802154/mib.c b/net/mac802154/mib.c
index 3ee6042..91cd3b2 100644
--- a/net/mac802154/mib.c
+++ b/net/mac802154/mib.c
@@ -23,7 +23,7 @@
#include <net/ieee802154_netdev.h>
#include <net/wpan-phy.h>
-#include "mac802154.h"
+#include "ieee802154_i.h"
struct phy_chan_notify_work {
struct work_struct work;
diff --git a/net/mac802154/monitor.c b/net/mac802154/monitor.c
index 81249bb..2647a9e 100644
--- a/net/mac802154/monitor.c
+++ b/net/mac802154/monitor.c
@@ -28,7 +28,7 @@
#include <net/wpan-phy.h>
#include <linux/nl802154.h>
-#include "mac802154.h"
+#include "ieee802154_i.h"
static netdev_tx_t mac802154_monitor_xmit(struct sk_buff *skb,
struct net_device *dev)
diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c
index e99d939..bc6cffd5 100644
--- a/net/mac802154/rx.c
+++ b/net/mac802154/rx.c
@@ -26,7 +26,7 @@
#include <net/mac802154.h>
#include <net/ieee802154_netdev.h>
-#include "mac802154.h"
+#include "ieee802154_i.h"
/* The IEEE 802.15.4 standard defines 4 MAC packet types:
* - beacon frame
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index 95ea412..ef11cc6 100644
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -25,7 +25,7 @@
#include <net/mac802154.h>
#include <net/wpan-phy.h>
-#include "mac802154.h"
+#include "ieee802154_i.h"
/* IEEE 802.15.4 transceivers can sleep during the xmit session, so process
* packets through the workqueue.
diff --git a/net/mac802154/wpan.c b/net/mac802154/wpan.c
index b11a98d..5adcbd8 100644
--- a/net/mac802154/wpan.c
+++ b/net/mac802154/wpan.c
@@ -29,7 +29,7 @@
#include <net/ieee802154.h>
#include <net/wpan-phy.h>
-#include "mac802154.h"
+#include "ieee802154_i.h"
static int mac802154_wpan_update_llsec(struct net_device *dev)
{
--
2.1.2
next prev parent reply other threads:[~2014-10-25 18:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-25 7:24 [PATCH bluetooth-next 0/7] ieee802154: file movements Alexander Aring
2014-10-25 7:24 ` [PATCH bluetooth-next 1/7] mac802154: move ieee802154_dev.c to main.c Alexander Aring
2014-10-25 7:25 ` Alexander Aring [this message]
2014-10-25 7:25 ` [PATCH bluetooth-next 3/7] mac802154: move wpan.c to iface.c Alexander Aring
2014-10-25 7:25 ` [PATCH bluetooth-next 4/7] ieee802154: move wpan-phy.h to cfg802154.h Alexander Aring
2014-10-25 7:25 ` [PATCH bluetooth-next 5/7] ieee802154: move wpan-class.c to core.c Alexander Aring
2014-10-25 7:25 ` [PATCH bluetooth-next 6/7] ieee802154: move ieee802154 header Alexander Aring
2014-10-25 7:25 ` [PATCH bluetooth-next 7/7] MAINTAINERS: add missing headers in 802.15.4 Alexander Aring
2014-10-25 7:33 ` [PATCH bluetooth-next 0/7] ieee802154: file movements Alexander Aring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1414221905-19422-3-git-send-email-alex.aring@gmail.com \
--to=alex.aring@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-wpan@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox