Skip to content

Commit

Permalink
mac802154: rename sdata slaves and slaves_mtx
Browse files Browse the repository at this point in the history 
This patch renamens the slaves attribute in sdata to interfaces and
slaves_mtx to iflist_mtx. This is similar like the mac80211 stack naming
convention.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Alexander Aring authored and Marcel Holtmann committed Oct 25, 2014
1 parent 04e850f commit d98be45
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 37 deletions.
4 changes: 2 additions & 2 deletions net/mac802154/ieee802154_i.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ struct ieee802154_local {
*
* So atomic readers can use any of this protection methods.
*/
struct list_head slaves;
struct mutex slaves_mtx;
struct list_head interfaces;
struct mutex iflist_mtx;

/* This one is used for scanning and other jobs not to be interfered
* with serial driver.
Expand Down
10 changes: 5 additions & 5 deletions net/mac802154/iface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ int mac802154_set_mac_params(struct net_device *dev,
{
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);

mutex_lock(&sdata->local->slaves_mtx);
mutex_lock(&sdata->local->iflist_mtx);
sdata->mac_params = *params;
mutex_unlock(&sdata->local->slaves_mtx);
mutex_unlock(&sdata->local->iflist_mtx);

return 0;
}
Expand All @@ -137,9 +137,9 @@ void mac802154_get_mac_params(struct net_device *dev,
{
struct ieee802154_sub_if_data *sdata = netdev_priv(dev);

mutex_lock(&sdata->local->slaves_mtx);
mutex_lock(&sdata->local->iflist_mtx);
*params = sdata->mac_params;
mutex_unlock(&sdata->local->slaves_mtx);
mutex_unlock(&sdata->local->iflist_mtx);
}

static int mac802154_wpan_open(struct net_device *dev)
Expand Down Expand Up @@ -580,7 +580,7 @@ void mac802154_wpans_rx(struct ieee802154_local *local, struct sk_buff *skb)
}

rcu_read_lock();
list_for_each_entry_rcu(sdata, &local->slaves, list) {
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
if (sdata->type != IEEE802154_DEV_WPAN ||
!netif_running(sdata->dev))
continue;
Expand Down
54 changes: 27 additions & 27 deletions net/mac802154/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,20 @@ int mac802154_slave_open(struct net_device *dev)
ASSERT_RTNL();

if (sdata->type == IEEE802154_DEV_WPAN) {
mutex_lock(&sdata->local->slaves_mtx);
list_for_each_entry(subif, &sdata->local->slaves, list) {
mutex_lock(&sdata->local->iflist_mtx);
list_for_each_entry(subif, &sdata->local->interfaces, list) {
if (subif != sdata && subif->type == sdata->type &&
subif->running) {
mutex_unlock(&sdata->local->slaves_mtx);
mutex_unlock(&sdata->local->iflist_mtx);
return -EBUSY;
}
}
mutex_unlock(&sdata->local->slaves_mtx);
mutex_unlock(&sdata->local->iflist_mtx);
}

mutex_lock(&sdata->local->slaves_mtx);
mutex_lock(&sdata->local->iflist_mtx);
sdata->running = true;
mutex_unlock(&sdata->local->slaves_mtx);
mutex_unlock(&sdata->local->iflist_mtx);

if (local->open_count++ == 0) {
res = local->ops->start(&local->hw);
Expand Down Expand Up @@ -88,9 +88,9 @@ int mac802154_slave_close(struct net_device *dev)

netif_stop_queue(dev);

mutex_lock(&sdata->local->slaves_mtx);
mutex_lock(&sdata->local->iflist_mtx);
sdata->running = false;
mutex_unlock(&sdata->local->slaves_mtx);
mutex_unlock(&sdata->local->iflist_mtx);

if (!--local->open_count)
local->ops->stop(&local->hw);
Expand All @@ -115,21 +115,21 @@ mac802154_netdev_register(struct wpan_phy *phy, struct net_device *dev)

SET_NETDEV_DEV(dev, &local->phy->dev);

mutex_lock(&local->slaves_mtx);
mutex_lock(&local->iflist_mtx);
if (!local->running) {
mutex_unlock(&local->slaves_mtx);
mutex_unlock(&local->iflist_mtx);
return -ENODEV;
}
mutex_unlock(&local->slaves_mtx);
mutex_unlock(&local->iflist_mtx);

err = register_netdev(dev);
if (err < 0)
return err;

rtnl_lock();
mutex_lock(&local->slaves_mtx);
list_add_tail_rcu(&sdata->list, &local->slaves);
mutex_unlock(&local->slaves_mtx);
mutex_lock(&local->iflist_mtx);
list_add_tail_rcu(&sdata->list, &local->interfaces);
mutex_unlock(&local->iflist_mtx);
rtnl_unlock();

return 0;
Expand All @@ -146,9 +146,9 @@ mac802154_del_iface(struct wpan_phy *phy, struct net_device *dev)

BUG_ON(sdata->local->phy != phy);

mutex_lock(&sdata->local->slaves_mtx);
mutex_lock(&sdata->local->iflist_mtx);
list_del_rcu(&sdata->list);
mutex_unlock(&sdata->local->slaves_mtx);
mutex_unlock(&sdata->local->iflist_mtx);

synchronize_rcu();
unregister_netdevice(sdata->dev);
Expand Down Expand Up @@ -280,8 +280,8 @@ ieee802154_alloc_hw(size_t priv_data_len, struct ieee802154_ops *ops)
local->hw.priv = (char *)local + ALIGN(sizeof(*local), NETDEV_ALIGN);
local->ops = ops;

INIT_LIST_HEAD(&local->slaves);
mutex_init(&local->slaves_mtx);
INIT_LIST_HEAD(&local->interfaces);
mutex_init(&local->iflist_mtx);

return &local->hw;
}
Expand All @@ -291,9 +291,9 @@ void ieee802154_free_hw(struct ieee802154_hw *hw)
{
struct ieee802154_local *local = mac802154_to_priv(hw);

BUG_ON(!list_empty(&local->slaves));
BUG_ON(!list_empty(&local->interfaces));

mutex_destroy(&local->slaves_mtx);
mutex_destroy(&local->iflist_mtx);

wpan_phy_free(local->phy);
}
Expand Down Expand Up @@ -364,9 +364,9 @@ int ieee802154_register_hw(struct ieee802154_hw *hw)

rtnl_lock();

mutex_lock(&local->slaves_mtx);
mutex_lock(&local->iflist_mtx);
local->running = MAC802154_DEVICE_RUN;
mutex_unlock(&local->slaves_mtx);
mutex_unlock(&local->iflist_mtx);

rtnl_unlock();

Expand All @@ -389,14 +389,14 @@ void ieee802154_unregister_hw(struct ieee802154_hw *hw)

rtnl_lock();

mutex_lock(&local->slaves_mtx);
mutex_lock(&local->iflist_mtx);
local->running = MAC802154_DEVICE_STOPPED;
mutex_unlock(&local->slaves_mtx);
mutex_unlock(&local->iflist_mtx);

list_for_each_entry_safe(sdata, next, &local->slaves, list) {
mutex_lock(&sdata->local->slaves_mtx);
list_for_each_entry_safe(sdata, next, &local->interfaces, list) {
mutex_lock(&sdata->local->iflist_mtx);
list_del(&sdata->list);
mutex_unlock(&sdata->local->slaves_mtx);
mutex_unlock(&sdata->local->iflist_mtx);

unregister_netdevice(sdata->dev);
}
Expand Down
2 changes: 1 addition & 1 deletion net/mac802154/monitor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void mac802154_monitors_rx(struct ieee802154_local *local, struct sk_buff *skb)
u8 *data;

rcu_read_lock();
list_for_each_entry_rcu(sdata, &local->slaves, list) {
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
if (sdata->type != IEEE802154_DEV_MONITOR ||
!netif_running(sdata->dev))
continue;
Expand Down
4 changes: 2 additions & 2 deletions net/mac802154/tx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ static void mac802154_xmit_worker(struct work_struct *work)

/* Restart the netif queue on each sub_if_data object. */
rcu_read_lock();
list_for_each_entry_rcu(sdata, &xw->local->slaves, list)
list_for_each_entry_rcu(sdata, &xw->local->interfaces, list)
netif_wake_queue(sdata->dev);
rcu_read_unlock();

Expand Down Expand Up @@ -109,7 +109,7 @@ netdev_tx_t mac802154_tx(struct ieee802154_local *local, struct sk_buff *skb,

/* Stop the netif queue on each sub_if_data object. */
rcu_read_lock();
list_for_each_entry_rcu(sdata, &local->slaves, list)
list_for_each_entry_rcu(sdata, &local->interfaces, list)
netif_stop_queue(sdata->dev);
rcu_read_unlock();

Expand Down

0 comments on commit d98be45

Please sign in to comment.