summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-10-25 11:41:03 +0400
committerMarcel Holtmann <marcel@holtmann.org>2014-10-25 23:39:56 +0400
commit86d52cd96414f05c4053fb264a85309772c6ae26 (patch)
treecf65fa03321390a5db420760a4cafe7aec9b0016 /net
parent5ad60d36993596f7b3b958500f9c66c5338cd855 (diff)
downloadlinux-86d52cd96414f05c4053fb264a85309772c6ae26.tar.xz
ieee802154: move wpan-class.c to core.c
Like the wireless core.c file this file contains function for phy allocation and freeing. Move this file to core.c to get similar behaviour. 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/Makefile2
-rw-r--r--net/ieee802154/core.c (renamed from net/ieee802154/wpan-class.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile
index 3914b1ed4274..e58c4cbb3639 100644
--- a/net/ieee802154/Makefile
+++ b/net/ieee802154/Makefile
@@ -2,7 +2,7 @@ obj-$(CONFIG_IEEE802154) += ieee802154.o af_802154.o
obj-$(CONFIG_IEEE802154_6LOWPAN) += ieee802154_6lowpan.o
ieee802154_6lowpan-y := 6lowpan_rtnl.o reassembly.o
-ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o wpan-class.o \
+ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o core.o \
header_ops.o
af_802154-y := af_ieee802154.o raw.o dgram.o
diff --git a/net/ieee802154/wpan-class.c b/net/ieee802154/core.c
index 760b7d752190..760b7d752190 100644
--- a/net/ieee802154/wpan-class.c
+++ b/net/ieee802154/core.c