mac802154: rework sdata state change to running

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>

diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h
index a379b971b13c98a1394cf33eff592944930014c6..e34fe51043f23a632f4bba27bac7d7744df3a1b6 100644 (file)
--- a/net/mac802154/ieee802154_i.h
+++ b/net/mac802154/ieee802154_i.h
@@ -67,6 +67,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.
@@ -80,7 +84,7 @@ struct ieee802154_sub_if_data {
        struct net_device *dev;
 
        int type;
-       bool running;
+       unsigned long state;
 
        spinlock_t mib_lock;
 
@@ -120,6 +124,12 @@ IEEE802154_DEV_TO_SUB_IF(const struct net_device *dev)
        return netdev_priv(dev);
 }
 
+static inline bool
+ieee802154_sdata_running(struct ieee802154_sub_if_data *sdata)
+{
+       return test_bit(SDATA_STATE_RUNNING, &sdata->state);
+}
+
 extern struct ieee802154_reduced_mlme_ops mac802154_mlme_reduced;
 extern struct ieee802154_mlme_ops mac802154_mlme_wpan;
 

diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index 300877a1a0c9fa0d02985d11ee2e940cf00b8b08..e10fd786a11f31d1cf9d1dac81f66e255fb4bb24 100644 (file)
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -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);