mac802154: slaves management support
This patch adds functionality for registration and removing slaves in the stack. Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
alex.bluesman.smirnov@gmail.com
David S. Miller
parent
90c049b2c6
commit
62610ad218
2 changed files with 145 additions and 0 deletions
|
|
@ -24,12 +24,140 @@
|
|||
#include <linux/module.h>
|
||||
#include <linux/netdevice.h>
|
||||
|
||||
#include <net/netlink.h>
|
||||
#include <linux/nl802154.h>
|
||||
#include <net/mac802154.h>
|
||||
#include <net/route.h>
|
||||
#include <net/wpan-phy.h>
|
||||
|
||||
#include "mac802154.h"
|
||||
|
||||
int mac802154_slave_open(struct net_device *dev)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct mac802154_priv *ipriv = priv->hw;
|
||||
int res = 0;
|
||||
|
||||
if (ipriv->open_count++ == 0) {
|
||||
res = ipriv->ops->start(&ipriv->hw);
|
||||
WARN_ON(res);
|
||||
if (res)
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (ipriv->ops->ieee_addr) {
|
||||
res = ipriv->ops->ieee_addr(&ipriv->hw, dev->dev_addr);
|
||||
WARN_ON(res);
|
||||
if (res)
|
||||
goto err;
|
||||
mac802154_dev_set_ieee_addr(dev);
|
||||
}
|
||||
|
||||
netif_start_queue(dev);
|
||||
return 0;
|
||||
err:
|
||||
priv->hw->open_count--;
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
int mac802154_slave_close(struct net_device *dev)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv = netdev_priv(dev);
|
||||
struct mac802154_priv *ipriv = priv->hw;
|
||||
|
||||
netif_stop_queue(dev);
|
||||
|
||||
if (!--ipriv->open_count)
|
||||
ipriv->ops->stop(&ipriv->hw);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
mac802154_netdev_register(struct wpan_phy *phy, struct net_device *dev)
|
||||
{
|
||||
struct mac802154_sub_if_data *priv;
|
||||
struct mac802154_priv *ipriv;
|
||||
int err;
|
||||
|
||||
ipriv = wpan_phy_priv(phy);
|
||||
|
||||
priv = netdev_priv(dev);
|
||||
priv->dev = dev;
|
||||
priv->hw = ipriv;
|
||||
|
||||
dev->needed_headroom = ipriv->hw.extra_tx_headroom;
|
||||
|
||||
SET_NETDEV_DEV(dev, &ipriv->phy->dev);
|
||||
|
||||
mutex_lock(&ipriv->slaves_mtx);
|
||||
if (!ipriv->running) {
|
||||
mutex_unlock(&ipriv->slaves_mtx);
|
||||
return -ENODEV;
|
||||
}
|
||||
mutex_unlock(&ipriv->slaves_mtx);
|
||||
|
||||
err = register_netdev(dev);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
rtnl_lock();
|
||||
mutex_lock(&ipriv->slaves_mtx);
|
||||
list_add_tail_rcu(&priv->list, &ipriv->slaves);
|
||||
mutex_unlock(&ipriv->slaves_mtx);
|
||||
rtnl_unlock();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
mac802154_del_iface(struct wpan_phy *phy, struct net_device *dev)
|
||||
{
|
||||
struct mac802154_sub_if_data *sdata;
|
||||
ASSERT_RTNL();
|
||||
|
||||
sdata = netdev_priv(dev);
|
||||
|
||||
BUG_ON(sdata->hw->phy != phy);
|
||||
|
||||
mutex_lock(&sdata->hw->slaves_mtx);
|
||||
list_del_rcu(&sdata->list);
|
||||
mutex_unlock(&sdata->hw->slaves_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;
|
||||
|
||||
/* No devices is currently added */
|
||||
switch (type) {
|
||||
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);
|
||||
}
|
||||
|
||||
struct ieee802154_dev *
|
||||
ieee802154_alloc_device(size_t priv_data_len, struct ieee802154_ops *ops)
|
||||
{
|
||||
|
|
@ -87,6 +215,8 @@ void ieee802154_free_device(struct ieee802154_dev *hw)
|
|||
{
|
||||
struct mac802154_priv *priv = mac802154_to_priv(hw);
|
||||
|
||||
BUG_ON(!list_empty(&priv->slaves));
|
||||
|
||||
wpan_phy_free(priv->phy);
|
||||
|
||||
mutex_destroy(&priv->slaves_mtx);
|
||||
|
|
@ -105,6 +235,9 @@ int ieee802154_register_device(struct ieee802154_dev *dev)
|
|||
|
||||
wpan_phy_set_dev(priv->phy, priv->hw.parent);
|
||||
|
||||
priv->phy->add_iface = mac802154_add_iface;
|
||||
priv->phy->del_iface = mac802154_del_iface;
|
||||
|
||||
rc = wpan_phy_register(priv->phy);
|
||||
if (rc < 0)
|
||||
goto out_wq;
|
||||
|
|
@ -129,6 +262,7 @@ EXPORT_SYMBOL(ieee802154_register_device);
|
|||
void ieee802154_unregister_device(struct ieee802154_dev *dev)
|
||||
{
|
||||
struct mac802154_priv *priv = mac802154_to_priv(dev);
|
||||
struct mac802154_sub_if_data *sdata, *next;
|
||||
|
||||
flush_workqueue(priv->dev_workqueue);
|
||||
destroy_workqueue(priv->dev_workqueue);
|
||||
|
|
@ -139,6 +273,14 @@ void ieee802154_unregister_device(struct ieee802154_dev *dev)
|
|||
priv->running = MAC802154_DEVICE_STOPPED;
|
||||
mutex_unlock(&priv->slaves_mtx);
|
||||
|
||||
list_for_each_entry_safe(sdata, next, &priv->slaves, list) {
|
||||
mutex_lock(&sdata->hw->slaves_mtx);
|
||||
list_del(&sdata->list);
|
||||
mutex_unlock(&sdata->hw->slaves_mtx);
|
||||
|
||||
unregister_netdevice(sdata->dev);
|
||||
}
|
||||
|
||||
rtnl_unlock();
|
||||
|
||||
wpan_phy_unregister(priv->phy);
|
||||
|
|
|
|||
|
|
@ -92,6 +92,9 @@ struct mac802154_sub_if_data {
|
|||
|
||||
extern struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced;
|
||||
|
||||
int mac802154_slave_open(struct net_device *dev);
|
||||
int mac802154_slave_close(struct net_device *dev);
|
||||
|
||||
netdev_tx_t mac802154_tx(struct mac802154_priv *priv, struct sk_buff *skb,
|
||||
u8 page, u8 chan);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue