admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

mac802154: rework sdata state change to running

Browse Source 
This patch reworks the handling for setting the state like mac80211. We
use bit's instead a bool variable. The mutex is not needed because it use
test and set bits which are atomic operations.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Alexander Aring
2014-10-28 18:21:24 +01:00
committed by Marcel Holtmann
parent a543c5989d
commit 0ea3da64fa
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
net/mac802154/iface.c
View File

@@ -156,7 +156,7 @@ static int mac802154_slave_open(struct net_device *dev)
mutex_lock(&sdata->local->iflist_mtx);
list_for_each_entry(subif, &sdata->local->interfaces, list) {
if (subif != sdata && subif->type == sdata->type &&
subif->running) {
ieee802154_sdata_running(subif)) {
mutex_unlock(&sdata->local->iflist_mtx);
return -EBUSY;
}
@@ -164,9 +164,7 @@ static int mac802154_slave_open(struct net_device *dev)
mutex_unlock(&sdata->local->iflist_mtx);
}
mutex_lock(&sdata->local->iflist_mtx);
sdata->running = true;
mutex_unlock(&sdata->local->iflist_mtx);
set_bit(SDATA_STATE_RUNNING, &sdata->state);
if (local->open_count++ == 0) {
res = drv_start(local);
@@ -178,6 +176,8 @@ static int mac802154_slave_open(struct net_device *dev)
netif_start_queue(dev);
return 0;
err:
/* might already be clear but that doesn't matter */
clear_bit(SDATA_STATE_RUNNING, &sdata->state);
sdata->local->open_count--;
return res;
@@ -253,9 +253,7 @@ static int mac802154_slave_close(struct net_device *dev)
netif_stop_queue(dev);
mutex_lock(&sdata->local->iflist_mtx);
sdata->running = false;
mutex_unlock(&sdata->local->iflist_mtx);
clear_bit(SDATA_STATE_RUNNING, &sdata->state);
if (!--local->open_count)
drv_stop(local);