mac802154: rename sdata slaves and slaves_mtx

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>

diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h
index c5b1ab743695cf0c015ab0045e9200b674b5376f..b7cf41c989ec78fd31d0b21d11f9e0733b219733 100644 (file)
--- a/net/mac802154/ieee802154_i.h
+++ b/net/mac802154/ieee802154_i.h
@@ -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.

diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index 6eace90da3eddcf3337becc2cbae9e85b21e0af4..c0dbb402b99bdf15d57c3b8bcbb4ce395cc52e91 100644 (file)
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -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;
 }
@@ -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)
@@ -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;

diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index 9b2644ff6de5c534cc4dff6ce40c7106fca44cc7..34e7e617611acc059c91097fa34b7f52f618bd73 100644 (file)
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -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);
@@ -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);
@@ -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;
@@ -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);
@@ -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;
 }
@@ -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);
 }
@@ -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();
 
@@ -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);
        }

diff --git a/net/mac802154/monitor.c b/net/mac802154/monitor.c
index 79bce5258b0c4a66bb236d42b3af894e3df2a04b..9d2ac5ea6634fd50c30f72d5166c8a8e650a72bb 100644 (file)
--- a/net/mac802154/monitor.c
+++ b/net/mac802154/monitor.c
@@ -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;

diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index d20dadd6f27c700425638fa7c48dd936cb6e2ee5..b6039c75d175cac3235796c6e83cc8865610eb3b 100644 (file)
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -68,7 +68,7 @@ out:
 
        /* 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();
 
@@ -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();