1 files changed, 14 insertions, 88 deletions

diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index 86e533ed3775..7d0ff7fd2cd4 100644
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -28,90 +28,7 @@
 #include <net/cfg802154.h>
 
 #include "ieee802154_i.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;
-}
-
-static void
-mac802154_del_iface(struct wpan_phy *phy, struct net_device *dev)
-{
-        struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
-
-        ASSERT_RTNL();
-
-        BUG_ON(sdata->local->phy != phy);
-
-        mutex_lock(&sdata->local->iflist_mtx);
-        list_del_rcu(&sdata->list);
-        mutex_unlock(&sdata->local->iflist_mtx);
-
-        synchronize_rcu();
-        unregister_netdevice(sdata->dev);
-}
-
-static 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);
-}
+#include "cfg.h"
 
 static void ieee802154_tasklet_handler(unsigned long data)
 {
@@ -169,7 +86,7 @@ ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops)
 
         priv_size = ALIGN(sizeof(*local), NETDEV_ALIGN) + priv_data_len;
 
-        phy = wpan_phy_alloc(priv_size);
+        phy = wpan_phy_alloc(&mac802154_config_ops, priv_size);
         if (!phy) {
                 pr_err("failure to allocate master IEEE802.15.4 device\n");
                 return NULL;
@@ -209,6 +126,7 @@ EXPORT_SYMBOL(ieee802154_free_hw);
 int ieee802154_register_hw(struct ieee802154_hw *hw)
 {
         struct ieee802154_local *local = hw_to_local(hw);
+        struct net_device *dev;
         int rc = -ENOSYS;
 
         local->workqueue =
@@ -220,13 +138,21 @@ int ieee802154_register_hw(struct ieee802154_hw *hw)
 
         wpan_phy_set_dev(local->phy, local->hw.parent);
 
-        local->phy->add_iface = mac802154_add_iface;
-        local->phy->del_iface = mac802154_del_iface;
-
         rc = wpan_phy_register(local->phy);
         if (rc < 0)
                 goto out_wq;
 
+        rtnl_lock();
+
+        dev = ieee802154_if_add(local, "wpan%d", NULL, IEEE802154_DEV_WPAN);
+        if (IS_ERR(dev)) {
+                rtnl_unlock();
+                rc = PTR_ERR(dev);
+                goto out_wq;
+        }
+
+        rtnl_unlock();
+
         return 0;
 
 out_wq: