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>

1 files changed, 5 insertions, 5 deletions

diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index 6eace90da3ed..c0dbb402b99b 100644
--- 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;