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: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h
new file mode 100644 (file)
index 0000000..970b621
--- /dev/null
+++ b/net/mac802154/ieee802154_i.h
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2007-2012 Siemens AG
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * Written by:
+ * Pavel Smolenskiy <pavel.smolenskiy@gmail.com>
+ * Maxim Gorbachyov <maxim.gorbachev@siemens.com>
+ * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+ * Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
+ */
+#ifndef __IEEE802154_I_H
+#define __IEEE802154_I_H
+
+#include <linux/mutex.h>
+#include <net/mac802154.h>
+#include <net/ieee802154_netdev.h>
+
+#include "llsec.h"
+
+/* mac802154 device private data */
+struct mac802154_priv {
+       struct ieee802154_dev hw;
+       struct ieee802154_ops *ops;
+
+       /* ieee802154 phy */
+       struct wpan_phy *phy;
+
+       int open_count;
+
+       /* As in mac80211 slaves list is modified:
+        * 1) under the RTNL
+        * 2) protected by slaves_mtx;
+        * 3) in an RCU manner
+        *
+        * So atomic readers can use any of this protection methods.
+        */
+       struct list_head        slaves;
+       struct mutex            slaves_mtx;
+
+       /* This one is used for scanning and other jobs not to be interfered
+        * with serial driver.
+        */
+       struct workqueue_struct *dev_workqueue;
+
+       /* SoftMAC device is registered and running. One can add subinterfaces.
+        * This flag should be modified under slaves_mtx and RTNL, so you can
+        * read them using any of protection methods.
+        */
+       bool running;
+};
+
+#define        MAC802154_DEVICE_STOPPED        0x00
+#define MAC802154_DEVICE_RUN           0x01
+
+/* Slave interface definition.
+ *
+ * Slaves represent typical network interfaces available from userspace.
+ * Each ieee802154 device/transceiver may have several slaves and able
+ * to be associated with several networks at the same time.
+ */
+struct mac802154_sub_if_data {
+       struct list_head list; /* the ieee802154_priv->slaves list */
+
+       struct mac802154_priv *hw;
+       struct net_device *dev;
+
+       int type;
+       bool running;
+
+       spinlock_t mib_lock;
+
+       __le16 pan_id;
+       __le16 short_addr;
+       __le64 extended_addr;
+
+       u8 chan;
+       u8 page;
+
+       struct ieee802154_mac_params mac_params;
+
+       /* MAC BSN field */
+       u8 bsn;
+       /* MAC DSN field */
+       u8 dsn;
+
+       /* protects sec from concurrent access by netlink. access by
+        * encrypt/decrypt/header_create safe without additional protection.
+        */
+       struct mutex sec_mtx;
+
+       struct mac802154_llsec sec;
+};
+
+#define mac802154_to_priv(_hw) container_of(_hw, struct mac802154_priv, hw)
+
+#define MAC802154_CHAN_NONE            0xff /* No channel is assigned */
+
+extern struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced;
+extern struct ieee802154_mlme_ops mac802154_mlme_wpan;
+
+int mac802154_slave_open(struct net_device *dev);
+int mac802154_slave_close(struct net_device *dev);
+
+void mac802154_monitors_rx(struct mac802154_priv *priv, struct sk_buff *skb);
+void mac802154_monitor_setup(struct net_device *dev);
+
+void mac802154_wpans_rx(struct mac802154_priv *priv, struct sk_buff *skb);
+void mac802154_wpan_setup(struct net_device *dev);
+
+netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb,
+                        u8 page, u8 chan);
+
+/* MIB callbacks */
+void mac802154_dev_set_short_addr(struct net_device *dev, __le16 val);
+__le16 mac802154_dev_get_short_addr(const struct net_device *dev);
+void mac802154_dev_set_ieee_addr(struct net_device *dev);
+__le16 mac802154_dev_get_pan_id(const struct net_device *dev);
+void mac802154_dev_set_pan_id(struct net_device *dev, __le16 val);
+void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan);
+u8 mac802154_dev_get_dsn(const struct net_device *dev);
+
+int mac802154_set_mac_params(struct net_device *dev,
+                            const struct ieee802154_mac_params *params);
+void mac802154_get_mac_params(struct net_device *dev,
+                             struct ieee802154_mac_params *params);
+
+int mac802154_get_params(struct net_device *dev,
+                        struct ieee802154_llsec_params *params);
+int mac802154_set_params(struct net_device *dev,
+                        const struct ieee802154_llsec_params *params,
+                        int changed);
+
+int mac802154_add_key(struct net_device *dev,
+                     const struct ieee802154_llsec_key_id *id,
+                     const struct ieee802154_llsec_key *key);
+int mac802154_del_key(struct net_device *dev,
+                     const struct ieee802154_llsec_key_id *id);
+
+int mac802154_add_dev(struct net_device *dev,
+                     const struct ieee802154_llsec_device *llsec_dev);
+int mac802154_del_dev(struct net_device *dev, __le64 dev_addr);
+
+int mac802154_add_devkey(struct net_device *dev,
+                        __le64 device_addr,
+                        const struct ieee802154_llsec_device_key *key);
+int mac802154_del_devkey(struct net_device *dev,
+                        __le64 device_addr,
+                        const struct ieee802154_llsec_device_key *key);
+
+int mac802154_add_seclevel(struct net_device *dev,
+                          const struct ieee802154_llsec_seclevel *sl);
+int mac802154_del_seclevel(struct net_device *dev,
+                          const struct ieee802154_llsec_seclevel *sl);
+
+void mac802154_lock_table(struct net_device *dev);
+void mac802154_get_table(struct net_device *dev,
+                        struct ieee802154_llsec_table **t);
+void mac802154_unlock_table(struct net_device *dev);
+
+#endif /* __IEEE802154_I_H */

diff --git a/net/mac802154/llsec.c b/net/mac802154/llsec.c
index 457058142098376bb9731600a9c162aaf4247b64..26f876128ae085f49d924a34429f40dd74f03dba 100644 (file)
--- 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/mac802154.h b/net/mac802154/mac802154.h
deleted file mode 100644 (file)
index e3503c1..0000000
--- a/net/mac802154/mac802154.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Siemens AG
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Written by:
- * Pavel Smolenskiy <pavel.smolenskiy@gmail.com>
- * Maxim Gorbachyov <maxim.gorbachev@siemens.com>
- * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
- * Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
- */
-#ifndef MAC802154_H
-#define MAC802154_H
-
-#include <linux/mutex.h>
-#include <net/mac802154.h>
-#include <net/ieee802154_netdev.h>
-
-#include "llsec.h"
-
-/* mac802154 device private data */
-struct mac802154_priv {
-       struct ieee802154_dev hw;
-       struct ieee802154_ops *ops;
-
-       /* ieee802154 phy */
-       struct wpan_phy *phy;
-
-       int open_count;
-
-       /* As in mac80211 slaves list is modified:
-        * 1) under the RTNL
-        * 2) protected by slaves_mtx;
-        * 3) in an RCU manner
-        *
-        * So atomic readers can use any of this protection methods.
-        */
-       struct list_head        slaves;
-       struct mutex            slaves_mtx;
-
-       /* This one is used for scanning and other jobs not to be interfered
-        * with serial driver.
-        */
-       struct workqueue_struct *dev_workqueue;
-
-       /* SoftMAC device is registered and running. One can add subinterfaces.
-        * This flag should be modified under slaves_mtx and RTNL, so you can
-        * read them using any of protection methods.
-        */
-       bool running;
-};
-
-#define        MAC802154_DEVICE_STOPPED        0x00
-#define MAC802154_DEVICE_RUN           0x01
-
-/* Slave interface definition.
- *
- * Slaves represent typical network interfaces available from userspace.
- * Each ieee802154 device/transceiver may have several slaves and able
- * to be associated with several networks at the same time.
- */
-struct mac802154_sub_if_data {
-       struct list_head list; /* the ieee802154_priv->slaves list */
-
-       struct mac802154_priv *hw;
-       struct net_device *dev;
-
-       int type;
-       bool running;
-
-       spinlock_t mib_lock;
-
-       __le16 pan_id;
-       __le16 short_addr;
-       __le64 extended_addr;
-
-       u8 chan;
-       u8 page;
-
-       struct ieee802154_mac_params mac_params;
-
-       /* MAC BSN field */
-       u8 bsn;
-       /* MAC DSN field */
-       u8 dsn;
-
-       /* protects sec from concurrent access by netlink. access by
-        * encrypt/decrypt/header_create safe without additional protection.
-        */
-       struct mutex sec_mtx;
-
-       struct mac802154_llsec sec;
-};
-
-#define mac802154_to_priv(_hw) container_of(_hw, struct mac802154_priv, hw)
-
-#define MAC802154_CHAN_NONE            0xff /* No channel is assigned */
-
-extern struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced;
-extern struct ieee802154_mlme_ops mac802154_mlme_wpan;
-
-int mac802154_slave_open(struct net_device *dev);
-int mac802154_slave_close(struct net_device *dev);
-
-void mac802154_monitors_rx(struct mac802154_priv *priv, struct sk_buff *skb);
-void mac802154_monitor_setup(struct net_device *dev);
-
-void mac802154_wpans_rx(struct mac802154_priv *priv, struct sk_buff *skb);
-void mac802154_wpan_setup(struct net_device *dev);
-
-netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb,
-                        u8 page, u8 chan);
-
-/* MIB callbacks */
-void mac802154_dev_set_short_addr(struct net_device *dev, __le16 val);
-__le16 mac802154_dev_get_short_addr(const struct net_device *dev);
-void mac802154_dev_set_ieee_addr(struct net_device *dev);
-__le16 mac802154_dev_get_pan_id(const struct net_device *dev);
-void mac802154_dev_set_pan_id(struct net_device *dev, __le16 val);
-void mac802154_dev_set_page_channel(struct net_device *dev, u8 page, u8 chan);
-u8 mac802154_dev_get_dsn(const struct net_device *dev);
-
-int mac802154_set_mac_params(struct net_device *dev,
-                            const struct ieee802154_mac_params *params);
-void mac802154_get_mac_params(struct net_device *dev,
-                             struct ieee802154_mac_params *params);
-
-int mac802154_get_params(struct net_device *dev,
-                        struct ieee802154_llsec_params *params);
-int mac802154_set_params(struct net_device *dev,
-                        const struct ieee802154_llsec_params *params,
-                        int changed);
-
-int mac802154_add_key(struct net_device *dev,
-                     const struct ieee802154_llsec_key_id *id,
-                     const struct ieee802154_llsec_key *key);
-int mac802154_del_key(struct net_device *dev,
-                     const struct ieee802154_llsec_key_id *id);
-
-int mac802154_add_dev(struct net_device *dev,
-                     const struct ieee802154_llsec_device *llsec_dev);
-int mac802154_del_dev(struct net_device *dev, __le64 dev_addr);
-
-int mac802154_add_devkey(struct net_device *dev,
-                        __le64 device_addr,
-                        const struct ieee802154_llsec_device_key *key);
-int mac802154_del_devkey(struct net_device *dev,
-                        __le64 device_addr,
-                        const struct ieee802154_llsec_device_key *key);
-
-int mac802154_add_seclevel(struct net_device *dev,
-                          const struct ieee802154_llsec_seclevel *sl);
-int mac802154_del_seclevel(struct net_device *dev,
-                          const struct ieee802154_llsec_seclevel *sl);
-
-void mac802154_lock_table(struct net_device *dev);
-void mac802154_get_table(struct net_device *dev,
-                        struct ieee802154_llsec_table **t);
-void mac802154_unlock_table(struct net_device *dev);
-
-#endif /* MAC802154_H */

diff --git a/net/mac802154/mac_cmd.c b/net/mac802154/mac_cmd.c
index 85f70edbe8dd1a6fadca07d86ecc352146f2fd68..7c4b05ba2fe1e665e02274d3173e9a3e6c1b53c3 100644 (file)
--- 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 086d4a91ae4535791375442e059b1e3d13f4e5ee..d11e42ae10d6c88286f8abf34f8ba7ecab24f722 100644 (file)
--- 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 3ee604292238afa1a61d0308bdd6cbae786d8fbb..91cd3b2602430b1ff8e7d6c422d94f16bd8e10d1 100644 (file)
--- 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 81249bb7c9357bb8cf11223437916a1ac9d33bb1..2647a9e002eaf31bde860ee8e806ad8c2ccdfdc7 100644 (file)
--- 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 e99d9394d13ab4064d30851d7f7dae6f2545b53b..bc6cffd51f94440a8c80feecf6d2da171fcd87e5 100644 (file)
--- 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 95ea412395c737df175dd135f70a68c7da23ef44..ef11cc6fa32333b711d79a7721662cb278c7e6d2 100644 (file)
--- 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 b11a98d824e098a9de3c373dd31b37cee5636b4a..5adcbd87a4f595d46894fc6c13c04a225a79bec3 100644 (file)
--- 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)
 {