mac802154: monitor: merge into iface implementation

This patch removes the monitor implementation file and put all monitor
stuff into iface file. It's now small enough to put all necessary
handling into iface.

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

diff --git a/net/mac802154/Makefile b/net/mac802154/Makefile
index e68deba..2e497d0 100644 (file)
--- 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 \
-                          monitor.o iface.o llsec.o util.o
+                          iface.o llsec.o util.o
 
 ccflags-y += -D__CHECK_ENDIAN__

diff --cc net/mac802154/iface.c
Simple merge

diff --cc net/mac802154/monitor.c
Simple merge