mac802154: monitor: merge into iface implementation
authorAlexander Aring <alex.aring@gmail.com>
Tue, 28 Oct 2014 17:21:16 +0000 (18:21 +0100)
committerMarcel Holtmann <marcel@holtmann.org>
Tue, 28 Oct 2014 22:19:06 +0000 (23:19 +0100)
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>
net/mac802154/Makefile
net/mac802154/iface.c
net/mac802154/monitor.c [deleted file]

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