diff options
| author | Alexander Aring <alex.aring@gmail.com> | 2014-10-25 17:16:38 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-10-25 21:55:38 +0200 |
| commit | d98be45b3657fc233f5a098279a4e42ab6f0fa4f (patch) | |
| tree | 3014bbeb14981bb3b3c4b913a09c6a44eeb5f8bb /net/mac802154/iface.c | |
| parent | 04e850fe06312a9f570fcc7dbd0f141c012df404 (diff) | |
| download | linux-d98be45b3657fc233f5a098279a4e42ab6f0fa4f.tar.gz linux-d98be45b3657fc233f5a098279a4e42ab6f0fa4f.tar.bz2 linux-d98be45b3657fc233f5a098279a4e42ab6f0fa4f.zip | |
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>
Diffstat (limited to 'net/mac802154/iface.c')
| -rw-r--r-- | net/mac802154/iface.c | 10 |
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; |