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]

index e68debaf2a5965485653beee8660139e13edf4c4..2e497d0c829ad7d09e4091f5d42b792d65fba63a 100644 (file)
@@ -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__
index 7e4bffcbcd4de7c9ae92a54659e96de8339378c1..dafb2c3ac1091cd5f7326314be8ec25245e428ce 100644 (file)
@@ -320,6 +320,12 @@ static const struct net_device_ops mac802154_wpan_ops = {
        .ndo_set_mac_address    = mac802154_wpan_mac_addr,
 };
 
+static const struct net_device_ops mac802154_monitor_ops = {
+       .ndo_open               = mac802154_slave_open,
+       .ndo_stop               = mac802154_slave_close,
+       .ndo_start_xmit         = ieee802154_monitor_start_xmit,
+};
+
 static void mac802154_wpan_free(struct net_device *dev)
 {
        struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
@@ -373,3 +379,27 @@ void mac802154_wpan_setup(struct net_device *dev)
 
        mac802154_llsec_init(&sdata->sec);
 }
+
+void mac802154_monitor_setup(struct net_device *dev)
+{
+       struct ieee802154_sub_if_data *sdata;
+
+       dev->addr_len           = 0;
+       dev->hard_header_len    = 0;
+       dev->needed_tailroom    = 2; /* room for FCS */
+       dev->mtu                = IEEE802154_MTU;
+       dev->tx_queue_len       = 10;
+       dev->type               = ARPHRD_IEEE802154_MONITOR;
+       dev->flags              = IFF_NOARP | IFF_BROADCAST;
+       dev->watchdog_timeo     = 0;
+
+       dev->destructor         = free_netdev;
+       dev->netdev_ops         = &mac802154_monitor_ops;
+       dev->ml_priv            = &mac802154_mlme_reduced;
+
+       sdata = IEEE802154_DEV_TO_SUB_IF(dev);
+       sdata->type = IEEE802154_DEV_MONITOR;
+
+       sdata->chan = MAC802154_CHAN_NONE; /* not initialized */
+       sdata->page = 0;
+}
diff --git a/net/mac802154/monitor.c b/net/mac802154/monitor.c
deleted file mode 100644 (file)
index dfdedc2..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2007, 2008, 2009 Siemens AG
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Written by:
- * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
- * Sergey Lapin <slapin@ossfans.org>
- * Maxim Gorbachyov <maxim.gorbachev@siemens.com>
- * Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
- */
-
-#include <linux/netdevice.h>
-#include <linux/if_arp.h>
-#include <linux/ieee802154.h>
-
-#include <net/mac802154.h>
-#include <net/netlink.h>
-#include <net/cfg802154.h>
-#include <linux/nl802154.h>
-
-#include "ieee802154_i.h"
-
-static const struct net_device_ops mac802154_monitor_ops = {
-       .ndo_open               = mac802154_slave_open,
-       .ndo_stop               = mac802154_slave_close,
-       .ndo_start_xmit         = ieee802154_monitor_start_xmit,
-};
-
-void mac802154_monitor_setup(struct net_device *dev)
-{
-       struct ieee802154_sub_if_data *sdata;
-
-       dev->addr_len           = 0;
-       dev->hard_header_len    = 0;
-       dev->needed_tailroom    = 2; /* room for FCS */
-       dev->mtu                = IEEE802154_MTU;
-       dev->tx_queue_len       = 10;
-       dev->type               = ARPHRD_IEEE802154_MONITOR;
-       dev->flags              = IFF_NOARP | IFF_BROADCAST;
-       dev->watchdog_timeo     = 0;
-
-       dev->destructor         = free_netdev;
-       dev->netdev_ops         = &mac802154_monitor_ops;
-       dev->ml_priv            = &mac802154_mlme_reduced;
-
-       sdata = IEEE802154_DEV_TO_SUB_IF(dev);
-       sdata->type = IEEE802154_DEV_MONITOR;
-
-       sdata->chan = MAC802154_CHAN_NONE; /* not initialized */
-       sdata->page = 0;
-}