aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-12-31 13:39:08 -0500
committerMarcel Holtmann <marcel@holtmann.org>2015-01-02 19:49:23 -0500
commit955d7fc93ed095c74fdc439c2893a87ca1652148 (patch)
treedc6ffd6752f99541dd981d7d84b52994f841058a
parent4fcef8ed75afb32e4ef892fd838e89754ee72c12 (diff)
ieee802154: handle socket functionality as module
This patch makes the ieee802154 socket handling as module. Currently this is part of ieee802154 module. It pointed out that ieee802154 module has also two module_init/module_exit functions. One inside of core.c and the other in af_ieee802154.c. This patch will also solve this issue by handle the af_802154 as separate module. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--net/ieee802154/Kconfig9
-rw-r--r--net/ieee802154/Makefile3
2 files changed, 11 insertions, 1 deletions
diff --git a/net/ieee802154/Kconfig b/net/ieee802154/Kconfig
index c0d4154d144f..98a190dea97d 100644
--- a/net/ieee802154/Kconfig
+++ b/net/ieee802154/Kconfig
@@ -10,6 +10,15 @@ config IEEE802154
10 Say Y here to compile LR-WPAN support into the kernel or say M to 10 Say Y here to compile LR-WPAN support into the kernel or say M to
11 compile it as modules. 11 compile it as modules.
12 12
13config IEEE802154_SOCKET
14 tristate "IEEE 802.15.4 socket interface"
15 depends on IEEE802154
16 default y
17 ---help---
18 Socket interface for IEEE 802.15.4. Contains DGRAM sockets interface
19 for 802.15.4 dataframes. Also RAW socket interface to build MAC
20 header from userspace.
21
13config IEEE802154_6LOWPAN 22config IEEE802154_6LOWPAN
14 tristate "6lowpan support over IEEE 802.15.4" 23 tristate "6lowpan support over IEEE 802.15.4"
15 depends on IEEE802154 && 6LOWPAN 24 depends on IEEE802154 && 6LOWPAN
diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile
index 9f6970f2a28b..53612d1debe1 100644
--- a/net/ieee802154/Makefile
+++ b/net/ieee802154/Makefile
@@ -1,4 +1,5 @@
1obj-$(CONFIG_IEEE802154) += ieee802154.o af_802154.o 1obj-$(CONFIG_IEEE802154) += ieee802154.o
2obj-$(CONFIG_IEEE802154_SOCKET) += af_802154.o
2obj-$(CONFIG_IEEE802154_6LOWPAN) += ieee802154_6lowpan.o 3obj-$(CONFIG_IEEE802154_6LOWPAN) += ieee802154_6lowpan.o
3 4
4ieee802154_6lowpan-y := 6lowpan_rtnl.o reassembly.o 5ieee802154_6lowpan-y := 6lowpan_rtnl.o reassembly.o