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's
locked by rtnl lock.
Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
---
net/mac802154/ieee802154_i.h | 6 +++++-
net/mac802154/iface.c | 10 ++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h
index c20fbc9..5bfdec0 100644
--- a/net/mac802154/ieee802154_i.h
+++ b/net/mac802154/ieee802154_i.h
@@ -31,6 +31,10 @@ enum {
IEEE802154_RX_MSG = 1,
};
+enum ieee802154_sdata_state_bits {
+ SDATA_STATE_RUNNING,
+};
+
/* Slave interface definition.
*
* Slaves represent typical network interfaces available from userspace.
@@ -44,7 +48,7 @@ struct ieee802154_sub_if_data {
struct net_device *dev;
int type;
- bool running;
+ unsigned long state;
spinlock_t mib_lock;
diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index 4655be5..d221562 100644
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -47,9 +47,7 @@ static int mac802154_slave_open(struct net_device *dev)
goto err;
}
- mutex_lock(&sdata->local->iflist_mtx);
- sdata->running = true;
- mutex_unlock(&sdata->local->iflist_mtx);
+ set_bit(SDATA_STATE_RUNNING, &sdata->state);
local->open_count++;
@@ -57,6 +55,8 @@ static int mac802154_slave_open(struct net_device *dev)
return 0;
err:
+ /* might already be clear but that doesn't matter */
+ clear_bit(SDATA_STATE_RUNNING, &sdata->state);
return res;
}
@@ -71,9 +71,7 @@ static int mac802154_slave_close(struct net_device *dev)
local->open_count--;
- 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);
--
2.0.3
--
To unsubscribe from this list: send the line "unsubscribe linux-wpan" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
