summaryrefslogtreecommitdiffstats
path: root/net/mac802154
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-11-02 04:18:36 +0100
committerMarcel Holtmann <marcel@holtmann.org>2014-11-02 04:51:06 +0100
commit1201cd22fd1f4579a888c0f7abc65627d5962f29 (patch)
tree1a11f0f5543e16f1dd8cee59cf0fb62b402a8705 /net/mac802154
parenta5dd1d72d868ec9c8f44d60ca29900b6a38321b4 (diff)
downloadblackbird-obmc-linux-1201cd22fd1f4579a888c0f7abc65627d5962f29.tar.gz
blackbird-obmc-linux-1201cd22fd1f4579a888c0f7abc65627d5962f29.zip
mac802154: introduce mac802154_config_ops
This patch introduces mac802154_config_ops struct. Like wireless this struct should be the only one interface between ieee802154 to mac802154 or possible HardMAC drivers. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/mac802154')
-rw-r--r--net/mac802154/Makefile2
-rw-r--r--net/mac802154/cfg.c19
-rw-r--r--net/mac802154/cfg.h9
-rw-r--r--net/mac802154/main.c3
4 files changed, 31 insertions, 2 deletions
diff --git a/net/mac802154/Makefile b/net/mac802154/Makefile
index 2e497d0c829a..702d8b466317 100644
--- a/net/mac802154/Makefile
+++ b/net/mac802154/Makefile
@@ -1,5 +1,5 @@
obj-$(CONFIG_MAC802154) += mac802154.o
mac802154-objs := main.o rx.o tx.o mac_cmd.o mib.o \
- iface.o llsec.o util.o
+ iface.o llsec.o util.o cfg.o
ccflags-y += -D__CHECK_ENDIAN__
diff --git a/net/mac802154/cfg.c b/net/mac802154/cfg.c
new file mode 100644
index 000000000000..105468ec8f26
--- /dev/null
+++ b/net/mac802154/cfg.c
@@ -0,0 +1,19 @@
+/* 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.
+ *
+ * Authors:
+ * Alexander Aring <aar@pengutronix.de>
+ *
+ * Based on: net/mac80211/cfg.c
+ */
+
+#include <net/cfg802154.h>
+
+const struct cfg802154_ops mac802154_config_ops = {
+};
diff --git a/net/mac802154/cfg.h b/net/mac802154/cfg.h
new file mode 100644
index 000000000000..e2718f981e82
--- /dev/null
+++ b/net/mac802154/cfg.h
@@ -0,0 +1,9 @@
+/* mac802154 configuration hooks for cfg802154
+ */
+
+#ifndef __CFG_H
+#define __CFG_H
+
+extern const struct cfg802154_ops mac802154_config_ops;
+
+#endif /* __CFG_H */
diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index ebc2bb123cfe..785abb1aafb4 100644
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -28,6 +28,7 @@
#include <net/cfg802154.h>
#include "ieee802154_i.h"
+#include "cfg.h"
static int
mac802154_netdev_register(struct wpan_phy *phy, struct net_device *dev)
@@ -169,7 +170,7 @@ ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops)
priv_size = ALIGN(sizeof(*local), NETDEV_ALIGN) + priv_data_len;
- phy = wpan_phy_alloc(NULL, priv_size);
+ phy = wpan_phy_alloc(&mac802154_config_ops, priv_size);
if (!phy) {
pr_err("failure to allocate master IEEE802.15.4 device\n");
return NULL;
OpenPOWER on IntegriCloud