ieee802154: rework interface registration
[deliverable/linux.git] / net / mac802154 / iface.c
index eaad66590f10bd223043e47fb39541adf2b98501..f9ed608aa26034e965c9f26607e13ee8abf1eddd 100644 (file)
@@ -112,39 +112,21 @@ static int mac802154_wpan_mac_addr(struct net_device *dev, void *p)
 {
        struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
        struct sockaddr *addr = p;
+       __le64 extended_addr;
 
        if (netif_running(dev))
                return -EBUSY;
 
-       /* FIXME: validate addr */
+       extended_addr = ieee802154_netdev_to_extended_addr(addr->sa_data);
+       if (!ieee802154_is_valid_extended_addr(extended_addr))
+               return -EINVAL;
+
        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
-       sdata->extended_addr = ieee802154_netdev_to_extended_addr(dev->dev_addr);
+       sdata->extended_addr = extended_addr;
 
        return mac802154_wpan_update_llsec(dev);
 }
 
-int mac802154_set_mac_params(struct net_device *dev,
-                            const struct ieee802154_mac_params *params)
-{
-       struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
-
-       mutex_lock(&sdata->local->iflist_mtx);
-       sdata->mac_params = *params;
-       mutex_unlock(&sdata->local->iflist_mtx);
-
-       return 0;
-}
-
-void mac802154_get_mac_params(struct net_device *dev,
-                             struct ieee802154_mac_params *params)
-{
-       struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
-
-       mutex_lock(&sdata->local->iflist_mtx);
-       *params = sdata->mac_params;
-       mutex_unlock(&sdata->local->iflist_mtx);
-}
-
 static int mac802154_slave_open(struct net_device *dev)
 {
        struct ieee802154_sub_if_data *sdata = IEEE802154_DEV_TO_SUB_IF(dev);
@@ -399,30 +381,23 @@ static void mac802154_wpan_free(struct net_device *dev)
        free_netdev(dev);
 }
 
-void mac802154_wpan_setup(struct net_device *dev)
+static void ieee802154_if_setup(struct net_device *dev)
 {
-       struct ieee802154_sub_if_data *sdata;
-
        dev->addr_len           = IEEE802154_ADDR_LEN;
        memset(dev->broadcast, 0xff, IEEE802154_ADDR_LEN);
 
        dev->hard_header_len    = MAC802154_FRAME_HARD_HEADER_LEN;
-       dev->header_ops         = &mac802154_header_ops;
        dev->needed_tailroom    = 2 + 16; /* FCS + MIC */
        dev->mtu                = IEEE802154_MTU;
        dev->tx_queue_len       = 300;
-       dev->type               = ARPHRD_IEEE802154;
        dev->flags              = IFF_NOARP | IFF_BROADCAST;
+}
 
-       dev->destructor         = mac802154_wpan_free;
-       dev->netdev_ops         = &mac802154_wpan_ops;
-       dev->ml_priv            = &mac802154_mlme_wpan;
-
-       sdata = IEEE802154_DEV_TO_SUB_IF(dev);
-       sdata->type = IEEE802154_DEV_WPAN;
-
-       spin_lock_init(&sdata->mib_lock);
-       mutex_init(&sdata->sec_mtx);
+static int
+ieee802154_setup_sdata(struct ieee802154_sub_if_data *sdata, int type)
+{
+       /* set some type-dependent values */
+       sdata->type = type;
 
        get_random_bytes(&sdata->bsn, 1);
        get_random_bytes(&sdata->dsn, 1);
@@ -437,27 +412,107 @@ void mac802154_wpan_setup(struct net_device *dev)
        sdata->pan_id = cpu_to_le16(IEEE802154_PANID_BROADCAST);
        sdata->short_addr = cpu_to_le16(IEEE802154_ADDR_BROADCAST);
 
-       sdata->promisuous_mode = false;
+       switch (type) {
+       case IEEE802154_DEV_WPAN:
+               sdata->dev->header_ops = &mac802154_header_ops;
+               sdata->dev->destructor = mac802154_wpan_free;
+               sdata->dev->netdev_ops = &mac802154_wpan_ops;
+               sdata->dev->ml_priv = &mac802154_mlme_wpan;
+               sdata->promisuous_mode = false;
 
-       mac802154_llsec_init(&sdata->sec);
+               spin_lock_init(&sdata->mib_lock);
+               mutex_init(&sdata->sec_mtx);
+
+               mac802154_llsec_init(&sdata->sec);
+               break;
+       case IEEE802154_DEV_MONITOR:
+               sdata->dev->destructor = free_netdev;
+               sdata->dev->netdev_ops = &mac802154_monitor_ops;
+               sdata->dev->ml_priv = &mac802154_mlme_reduced;
+               sdata->promisuous_mode = true;
+               break;
+       default:
+               BUG();
+       }
+
+       return 0;
 }
 
-void mac802154_monitor_setup(struct net_device *dev)
+struct net_device *
+ieee802154_if_add(struct ieee802154_local *local, const char *name,
+                 struct wpan_dev **new_wpan_dev, int type)
 {
-       struct ieee802154_sub_if_data *sdata;
+       struct net_device *ndev = NULL;
+       struct ieee802154_sub_if_data *sdata = NULL;
+       int ret = -ENOMEM;
 
-       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;
+       ASSERT_RTNL();
+
+       ndev = alloc_netdev(sizeof(*sdata), name, NET_NAME_UNKNOWN,
+                           ieee802154_if_setup);
+       if (!ndev)
+               return ERR_PTR(-ENOMEM);
+
+       ndev->needed_headroom = local->hw.extra_tx_headroom;
+
+       ret = dev_alloc_name(ndev, ndev->name);
+       if (ret < 0)
+               goto err;
+
+       switch (type) {
+       case IEEE802154_DEV_WPAN:
+               ndev->type = ARPHRD_IEEE802154;
+               break;
+       case IEEE802154_DEV_MONITOR:
+               ndev->type = ARPHRD_IEEE802154_MONITOR;
+               break;
+       default:
+               ret = -EINVAL;
+               goto err;
+       }
 
-       dev->destructor         = free_netdev;
-       dev->netdev_ops         = &mac802154_monitor_ops;
-       dev->ml_priv            = &mac802154_mlme_reduced;
+       /* TODO check this */
+       SET_NETDEV_DEV(ndev, &local->phy->dev);
+       sdata = netdev_priv(ndev);
+       ndev->ieee802154_ptr = &sdata->wpan_dev;
+       memcpy(sdata->name, ndev->name, IFNAMSIZ);
+       sdata->dev = ndev;
+       sdata->wpan_dev.wpan_phy = local->hw.phy;
+       sdata->local = local;
+
+       /* setup type-dependent data */
+       ret = ieee802154_setup_sdata(sdata, type);
+       if (ret)
+               goto err;
+
+       if (ndev) {
+               ret = register_netdevice(ndev);
+               if (ret < 0)
+                       goto err;
+       }
+
+       mutex_lock(&local->iflist_mtx);
+       list_add_tail_rcu(&sdata->list, &local->interfaces);
+       mutex_unlock(&local->iflist_mtx);
+
+       if (new_wpan_dev)
+               *new_wpan_dev = &sdata->wpan_dev;
 
-       sdata = IEEE802154_DEV_TO_SUB_IF(dev);
-       sdata->type = IEEE802154_DEV_MONITOR;
+       return ndev;
+
+err:
+       free_netdev(ndev);
+       return ERR_PTR(ret);
+}
+
+void ieee802154_if_remove(struct ieee802154_sub_if_data *sdata)
+{
+       ASSERT_RTNL();
+
+       mutex_lock(&sdata->local->iflist_mtx);
+       list_del_rcu(&sdata->list);
+       mutex_unlock(&sdata->local->iflist_mtx);
 
-       sdata->promisuous_mode = true;
+       synchronize_rcu();
+       unregister_netdevice(sdata->dev);
 }
This page took 0.037654 seconds and 5 git commands to generate.