mac802154: move interface add handling in iface

[deliverable/linux.git] / net / mac802154 / main.c

diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index 333d33daec6ee1bc90c96347decd804027dc5a2d..a371eb5fa0539ac9d8ed375b7c878ae3f6321c29 100644 (file)
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -30,73 +30,6 @@
 #include "ieee802154_i.h"
 #include "cfg.h"
 
-static int
-mac802154_netdev_register(struct wpan_phy *phy, struct net_device *dev)
-{
-       struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
-       struct ieee802154_local *local;
-       int err;
-
-       local = wpan_phy_priv(phy);
-
-       sdata->dev = dev;
-       sdata->local = local;
-
-       dev->needed_headroom = local->hw.extra_tx_headroom;
-
-       SET_NETDEV_DEV(dev, &local->phy->dev);
-
-       err = register_netdev(dev);
-       if (err < 0)
-               return err;
-
-       rtnl_lock();
-       mutex_lock(&local->iflist_mtx);
-       list_add_tail_rcu(&sdata->list, &local->interfaces);
-       mutex_unlock(&local->iflist_mtx);
-       rtnl_unlock();
-
-       return 0;
-}
-
-struct net_device *
-mac802154_add_iface(struct wpan_phy *phy, const char *name, int type)
-{
-       struct net_device *dev;
-       int err = -ENOMEM;
-
-       switch (type) {
-       case IEEE802154_DEV_MONITOR:
-               dev = alloc_netdev(sizeof(struct ieee802154_sub_if_data),
-                                  name, NET_NAME_UNKNOWN,
-                                  mac802154_monitor_setup);
-               break;
-       case IEEE802154_DEV_WPAN:
-               dev = alloc_netdev(sizeof(struct ieee802154_sub_if_data),
-                                  name, NET_NAME_UNKNOWN,
-                                  mac802154_wpan_setup);
-               break;
-       default:
-               dev = NULL;
-               err = -EINVAL;
-               break;
-       }
-       if (!dev)
-               goto err;
-
-       err = mac802154_netdev_register(phy, dev);
-       if (err)
-               goto err_free;
-
-       dev_hold(dev); /* we return an incremented device refcount */
-       return dev;
-
-err_free:
-       free_netdev(dev);
-err:
-       return ERR_PTR(err);
-}
-
 static void ieee802154_tasklet_handler(unsigned long data)
 {
        struct ieee802154_local *local = (struct ieee802154_local *)data;