aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac802154
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-10-28 13:21:25 -0400
committerMarcel Holtmann <marcel@holtmann.org>2014-10-28 18:19:08 -0400
commit5d65cae4bf6ffe29bba90f621e947922c5fb80db (patch)
tree598d2c5b11b62fe3873c882693347daf1ad59eea /net/mac802154
parent0ea3da64fa602efa0a89502eefdb396be84d2eba (diff)
mac802154: rename running to started
This variable should be handled like ieee80211_local struct of mac80211. We rename this variable to started now to have the same name convention. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/mac802154')
-rw-r--r--net/mac802154/ieee802154_i.h2
-rw-r--r--net/mac802154/main.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h
index e34fe51043f2..f52afd4ced92 100644
--- a/net/mac802154/ieee802154_i.h
+++ b/net/mac802154/ieee802154_i.h
@@ -54,7 +54,7 @@ struct ieee802154_local {
54 * This flag should be modified under slaves_mtx and RTNL, so you can 54 * This flag should be modified under slaves_mtx and RTNL, so you can
55 * read them using any of protection methods. 55 * read them using any of protection methods.
56 */ 56 */
57 bool running; 57 bool started;
58 58
59 struct tasklet_struct tasklet; 59 struct tasklet_struct tasklet;
60 struct sk_buff_head skb_queue; 60 struct sk_buff_head skb_queue;
diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index 9fa9514b3a36..7458f71c151c 100644
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -47,7 +47,7 @@ mac802154_netdev_register(struct wpan_phy *phy, struct net_device *dev)
47 SET_NETDEV_DEV(dev, &local->phy->dev); 47 SET_NETDEV_DEV(dev, &local->phy->dev);
48 48
49 mutex_lock(&local->iflist_mtx); 49 mutex_lock(&local->iflist_mtx);
50 if (!local->running) { 50 if (!local->started) {
51 mutex_unlock(&local->iflist_mtx); 51 mutex_unlock(&local->iflist_mtx);
52 return -ENODEV; 52 return -ENODEV;
53 } 53 }
@@ -238,7 +238,7 @@ int ieee802154_register_hw(struct ieee802154_hw *hw)
238 rtnl_lock(); 238 rtnl_lock();
239 239
240 mutex_lock(&local->iflist_mtx); 240 mutex_lock(&local->iflist_mtx);
241 local->running = MAC802154_DEVICE_RUN; 241 local->started = MAC802154_DEVICE_RUN;
242 mutex_unlock(&local->iflist_mtx); 242 mutex_unlock(&local->iflist_mtx);
243 243
244 rtnl_unlock(); 244 rtnl_unlock();
@@ -264,7 +264,7 @@ void ieee802154_unregister_hw(struct ieee802154_hw *hw)
264 rtnl_lock(); 264 rtnl_lock();
265 265
266 mutex_lock(&local->iflist_mtx); 266 mutex_lock(&local->iflist_mtx);
267 local->running = MAC802154_DEVICE_STOPPED; 267 local->started = MAC802154_DEVICE_STOPPED;
268 mutex_unlock(&local->iflist_mtx); 268 mutex_unlock(&local->iflist_mtx);
269 269
270 list_for_each_entry_safe(sdata, next, &local->interfaces, list) { 270 list_for_each_entry_safe(sdata, next, &local->interfaces, list) {