net: mac802154: Fix a Tx warning check

The purpose of the netif_is_down() helper was to ensure that the network
interface used was still up when performing the transmission. What it
actually did was to check if _all_ interfaces were up. This was not
noticed at that time because I did not use interfaces at all before
discussing with Alexander Aring about how to handle coordinators
properly.

Drop the helper and call netif_running() on the right sub interface
object directly.

Fixes: 4f790184139b ("net: mac802154: Add a warning in the slow path")
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Acked-by: Alexander Aring <aahringo@redhat.com>
Link: https://lore.kernel.org/r/20220617192914.1275611-1-miquel.raynal@bootlin.com
Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>

diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h
index 8a4816ae71e7b732b41925713716692df88e5593..010365a6364e080593fac5b495c3c8610766f993 100644 (file)
--- a/net/mac802154/ieee802154_i.h
+++ b/net/mac802154/ieee802154_i.h
@@ -126,9 +126,13 @@ void ieee802154_rx(struct ieee802154_local *local, struct sk_buff *skb);
 void ieee802154_xmit_sync_worker(struct work_struct *work);
 int ieee802154_sync_and_hold_queue(struct ieee802154_local *local);
 int ieee802154_mlme_op_pre(struct ieee802154_local *local);
-int ieee802154_mlme_tx(struct ieee802154_local *local, struct sk_buff *skb);
+int ieee802154_mlme_tx(struct ieee802154_local *local,
+                      struct ieee802154_sub_if_data *sdata,
+                      struct sk_buff *skb);
 void ieee802154_mlme_op_post(struct ieee802154_local *local);
-int ieee802154_mlme_tx_one(struct ieee802154_local *local, struct sk_buff *skb);
+int ieee802154_mlme_tx_one(struct ieee802154_local *local,
+                          struct ieee802154_sub_if_data *sdata,
+                          struct sk_buff *skb);
 netdev_tx_t
 ieee802154_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev);
 netdev_tx_t

diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index 8ddcd2e841cabe145794e026b09aaf34d269f0e8..9d8d43cf1e64ccc333948912ecc377424c00d43a 100644 (file)
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -132,31 +132,14 @@ int ieee802154_sync_and_hold_queue(struct ieee802154_local *local)
        return ret;
 }
 
-static bool ieee802154_netif_is_down(struct ieee802154_local *local)
-{
-       struct ieee802154_sub_if_data *sdata;
-       bool is_down = true;
-
-       rcu_read_lock();
-       list_for_each_entry_rcu(sdata, &local->interfaces, list) {
-               if (!sdata->dev)
-                       continue;
-
-               is_down = !netif_running(sdata->dev);
-               if (is_down)
-                       break;
-       }
-       rcu_read_unlock();
-
-       return is_down;
-}
-
 int ieee802154_mlme_op_pre(struct ieee802154_local *local)
 {
        return ieee802154_sync_and_hold_queue(local);
 }
 
-int ieee802154_mlme_tx(struct ieee802154_local *local, struct sk_buff *skb)
+int ieee802154_mlme_tx(struct ieee802154_local *local,
+                      struct ieee802154_sub_if_data *sdata,
+                      struct sk_buff *skb)
 {
        int ret;
 
@@ -174,7 +157,7 @@ int ieee802154_mlme_tx(struct ieee802154_local *local, struct sk_buff *skb)
        /* Warn if the ieee802154 core thinks MLME frames can be sent while the
         * net interface expects this cannot happen.
         */
-       if (WARN_ON_ONCE(ieee802154_netif_is_down(local))) {
+       if (WARN_ON_ONCE(!netif_running(sdata->dev))) {
                rtnl_unlock();
                return -ENETDOWN;
        }
@@ -192,12 +175,14 @@ void ieee802154_mlme_op_post(struct ieee802154_local *local)
        ieee802154_release_queue(local);
 }
 
-int ieee802154_mlme_tx_one(struct ieee802154_local *local, struct sk_buff *skb)
+int ieee802154_mlme_tx_one(struct ieee802154_local *local,
+                          struct ieee802154_sub_if_data *sdata,
+                          struct sk_buff *skb)
 {
        int ret;
 
        ieee802154_mlme_op_pre(local);
-       ret = ieee802154_mlme_tx(local, skb);
+       ret = ieee802154_mlme_tx(local, sdata, skb);
        ieee802154_mlme_op_post(local);
 
        return ret;