diff options
| author | Alexander Aring <alex.aring@gmail.com> | 2015-01-04 17:10:53 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2015-01-08 07:25:59 +0100 |
| commit | ea81ac2e7050798109356150ea16e71622a5c329 (patch) | |
| tree | fedb5990ebf350edc2c7ec6956ece51c85dcc221 /net | |
| parent | a9cc32d96c62b230c664a362b5f3206d3bcf35b8 (diff) | |
| download | blackbird-op-linux-ea81ac2e7050798109356150ea16e71622a5c329.tar.gz blackbird-op-linux-ea81ac2e7050798109356150ea16e71622a5c329.zip | |
ieee802154: create 6lowpan sub-directory
This patch creates an 6lowpan sub-directory inside ieee802154.
Additional we move all ieee802154 6lowpan relevant files into
this sub-directory instead of placing the 6lowpan related files
inside ieee802154.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ieee802154/6lowpan/6lowpan_rtnl.c (renamed from net/ieee802154/6lowpan_rtnl.c) | 0 | ||||
| -rw-r--r-- | net/ieee802154/6lowpan/Kconfig | 5 | ||||
| -rw-r--r-- | net/ieee802154/6lowpan/Makefile | 3 | ||||
| -rw-r--r-- | net/ieee802154/6lowpan/reassembly.c (renamed from net/ieee802154/reassembly.c) | 0 | ||||
| -rw-r--r-- | net/ieee802154/6lowpan/reassembly.h (renamed from net/ieee802154/reassembly.h) | 0 | ||||
| -rw-r--r-- | net/ieee802154/Kconfig | 6 | ||||
| -rw-r--r-- | net/ieee802154/Makefile | 3 |
7 files changed, 10 insertions, 7 deletions
diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan/6lowpan_rtnl.c index 27eaa65e88e1..27eaa65e88e1 100644 --- a/net/ieee802154/6lowpan_rtnl.c +++ b/net/ieee802154/6lowpan/6lowpan_rtnl.c diff --git a/net/ieee802154/6lowpan/Kconfig b/net/ieee802154/6lowpan/Kconfig new file mode 100644 index 000000000000..d24f985b0bfd --- /dev/null +++ b/net/ieee802154/6lowpan/Kconfig @@ -0,0 +1,5 @@ +config IEEE802154_6LOWPAN + tristate "6lowpan support over IEEE 802.15.4" + depends on 6LOWPAN + ---help--- + IPv6 compression over IEEE 802.15.4. diff --git a/net/ieee802154/6lowpan/Makefile b/net/ieee802154/6lowpan/Makefile new file mode 100644 index 000000000000..936959bd4f99 --- /dev/null +++ b/net/ieee802154/6lowpan/Makefile @@ -0,0 +1,3 @@ +obj-y += ieee802154_6lowpan.o + +ieee802154_6lowpan-y := 6lowpan_rtnl.o reassembly.o diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/6lowpan/reassembly.c index 9d980ed3ffe2..9d980ed3ffe2 100644 --- a/net/ieee802154/reassembly.c +++ b/net/ieee802154/6lowpan/reassembly.c diff --git a/net/ieee802154/reassembly.h b/net/ieee802154/6lowpan/reassembly.h index 836b16fa001f..836b16fa001f 100644 --- a/net/ieee802154/reassembly.h +++ b/net/ieee802154/6lowpan/reassembly.h diff --git a/net/ieee802154/Kconfig b/net/ieee802154/Kconfig index 9ea0af49a4ea..1370d5b0041b 100644 --- a/net/ieee802154/Kconfig +++ b/net/ieee802154/Kconfig @@ -20,10 +20,6 @@ config IEEE802154_SOCKET for 802.15.4 dataframes. Also RAW socket interface to build MAC header from userspace. -config IEEE802154_6LOWPAN - tristate "6lowpan support over IEEE 802.15.4" - depends on 6LOWPAN - ---help--- - IPv6 compression over IEEE 802.15.4. +source "net/ieee802154/6lowpan/Kconfig" endif diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile index 88bde78754c5..36533978b5ef 100644 --- a/net/ieee802154/Makefile +++ b/net/ieee802154/Makefile @@ -1,8 +1,7 @@ obj-$(CONFIG_IEEE802154) += ieee802154.o obj-$(CONFIG_IEEE802154_SOCKET) += ieee802154_socket.o -obj-$(CONFIG_IEEE802154_6LOWPAN) += ieee802154_6lowpan.o +obj-$(CONFIG_IEEE802154_6LOWPAN) += 6lowpan/ -ieee802154_6lowpan-y := 6lowpan_rtnl.o reassembly.o ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o core.o \ header_ops.o sysfs.o nl802154.o ieee802154_socket-y := socket.o |
