Commit 0f1556bc authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann

mac802154: move mac802154.h to ieee802154_i.h

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: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 62eb01f5
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
* Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
* Alexander Smirnov <alex.bluesman.smirnov@gmail.com> * Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
*/ */
#ifndef MAC802154_H #ifndef __IEEE802154_I_H
#define MAC802154_H #define __IEEE802154_I_H
#include <linux/mutex.h> #include <linux/mutex.h>
#include <net/mac802154.h> #include <net/mac802154.h>
...@@ -165,4 +165,4 @@ void mac802154_get_table(struct net_device *dev, ...@@ -165,4 +165,4 @@ void mac802154_get_table(struct net_device *dev,
struct ieee802154_llsec_table **t); struct ieee802154_llsec_table **t);
void mac802154_unlock_table(struct net_device *dev); void mac802154_unlock_table(struct net_device *dev);
#endif /* MAC802154_H */ #endif /* __IEEE802154_I_H */
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <net/ieee802154.h> #include <net/ieee802154.h>
#include <crypto/algapi.h> #include <crypto/algapi.h>
#include "mac802154.h" #include "ieee802154_i.h"
#include "llsec.h" #include "llsec.h"
static void llsec_key_put(struct mac802154_llsec_key *key); static void llsec_key_put(struct mac802154_llsec_key *key);
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <net/mac802154.h> #include <net/mac802154.h>
#include <net/nl802154.h> #include <net/nl802154.h>
#include "mac802154.h" #include "ieee802154_i.h"
static int mac802154_mlme_start_req(struct net_device *dev, static int mac802154_mlme_start_req(struct net_device *dev,
struct ieee802154_addr *addr, struct ieee802154_addr *addr,
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <net/route.h> #include <net/route.h>
#include <net/wpan-phy.h> #include <net/wpan-phy.h>
#include "mac802154.h" #include "ieee802154_i.h"
int mac802154_slave_open(struct net_device *dev) int mac802154_slave_open(struct net_device *dev)
{ {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <net/ieee802154_netdev.h> #include <net/ieee802154_netdev.h>
#include <net/wpan-phy.h> #include <net/wpan-phy.h>
#include "mac802154.h" #include "ieee802154_i.h"
struct phy_chan_notify_work { struct phy_chan_notify_work {
struct work_struct work; struct work_struct work;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <net/wpan-phy.h> #include <net/wpan-phy.h>
#include <linux/nl802154.h> #include <linux/nl802154.h>
#include "mac802154.h" #include "ieee802154_i.h"
static netdev_tx_t mac802154_monitor_xmit(struct sk_buff *skb, static netdev_tx_t mac802154_monitor_xmit(struct sk_buff *skb,
struct net_device *dev) struct net_device *dev)
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <net/mac802154.h> #include <net/mac802154.h>
#include <net/ieee802154_netdev.h> #include <net/ieee802154_netdev.h>
#include "mac802154.h" #include "ieee802154_i.h"
/* The IEEE 802.15.4 standard defines 4 MAC packet types: /* The IEEE 802.15.4 standard defines 4 MAC packet types:
* - beacon frame * - beacon frame
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <net/mac802154.h> #include <net/mac802154.h>
#include <net/wpan-phy.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 /* IEEE 802.15.4 transceivers can sleep during the xmit session, so process
* packets through the workqueue. * packets through the workqueue.
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <net/ieee802154.h> #include <net/ieee802154.h>
#include <net/wpan-phy.h> #include <net/wpan-phy.h>
#include "mac802154.h" #include "ieee802154_i.h"
static int mac802154_wpan_update_llsec(struct net_device *dev) static int mac802154_wpan_update_llsec(struct net_device *dev)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment