From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Alexander Aring <alex.aring@gmail.com>,
Stefan Schmidt <stefan@datenfreihafen.org>,
linux-wpan@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
netdev@vger.kernel.org, David Girault <david.girault@qorvo.com>,
Romuald Despres <romuald.despres@qorvo.com>,
Frederic Blain <frederic.blain@qorvo.com>,
Nicolas Schodet <nico@ni.fr.eu.org>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Miquel Raynal <miquel.raynal@bootlin.com>
Subject: [PATCH wpan-next v2 02/11] net: mac802154: Rename the main tx_work struct
Date: Thu, 12 May 2022 16:33:05 +0200 [thread overview]
Message-ID: <20220512143314.235604-3-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20220512143314.235604-1-miquel.raynal@bootlin.com>
This entry is dedicated to synchronous transmissions done by drivers
without async hook. Make this clearer that this is not a work that any
driver can use by at least prefixing it with "sync_". While at it, let's
enhance the comment explaining why we choose one or the other.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
net/mac802154/ieee802154_i.h | 2 +-
net/mac802154/main.c | 2 +-
net/mac802154/tx.c | 9 ++++++---
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/net/mac802154/ieee802154_i.h b/net/mac802154/ieee802154_i.h
index d7632c6d225f..a8b7b9049f14 100644
--- a/net/mac802154/ieee802154_i.h
+++ b/net/mac802154/ieee802154_i.h
@@ -55,7 +55,7 @@ struct ieee802154_local {
struct sk_buff_head skb_queue;
struct sk_buff *tx_skb;
- struct work_struct tx_work;
+ struct work_struct sync_tx_work;
/* A negative Linux error code or a null/positive MLME error status */
int tx_result;
};
diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index 392771bba9dd..40fab08df24b 100644
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -95,7 +95,7 @@ ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops)
skb_queue_head_init(&local->skb_queue);
- INIT_WORK(&local->tx_work, ieee802154_xmit_sync_worker);
+ INIT_WORK(&local->sync_tx_work, ieee802154_xmit_sync_worker);
/* init supported flags with 802.15.4 default ranges */
phy->supported.max_minbe = 8;
diff --git a/net/mac802154/tx.c b/net/mac802154/tx.c
index 97df5985b830..a01689ddd547 100644
--- a/net/mac802154/tx.c
+++ b/net/mac802154/tx.c
@@ -25,7 +25,7 @@
void ieee802154_xmit_sync_worker(struct work_struct *work)
{
struct ieee802154_local *local =
- container_of(work, struct ieee802154_local, tx_work);
+ container_of(work, struct ieee802154_local, sync_tx_work);
struct sk_buff *skb = local->tx_skb;
struct net_device *dev = skb->dev;
int res;
@@ -76,7 +76,10 @@ ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb)
/* Stop the netif queue on each sub_if_data object. */
ieee802154_stop_queue(&local->hw);
- /* async is priority, otherwise sync is fallback */
+ /* Drivers should preferably implement the async callback. In some rare
+ * cases they only provide a sync callback which we will use as a
+ * fallback.
+ */
if (local->ops->xmit_async) {
unsigned int len = skb->len;
@@ -90,7 +93,7 @@ ieee802154_tx(struct ieee802154_local *local, struct sk_buff *skb)
dev->stats.tx_bytes += len;
} else {
local->tx_skb = skb;
- queue_work(local->workqueue, &local->tx_work);
+ queue_work(local->workqueue, &local->sync_tx_work);
}
return NETDEV_TX_OK;
--
2.27.0
next prev parent reply other threads:[~2022-05-12 14:33 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-12 14:33 [PATCH wpan-next v2 00/11] ieee802154: Synchronous Tx support Miquel Raynal
2022-05-12 14:33 ` [PATCH wpan-next v2 01/11] net: mac802154: Rename the synchronous xmit worker Miquel Raynal
2022-05-12 14:33 ` Miquel Raynal [this message]
2022-05-12 14:33 ` [PATCH wpan-next v2 03/11] net: mac802154: Enhance the error path in the main tx helper Miquel Raynal
2022-05-12 14:33 ` [PATCH wpan-next v2 04/11] net: mac802154: Follow the count of ongoing transmissions Miquel Raynal
2022-05-12 14:33 ` [PATCH wpan-next v2 05/11] net: mac802154: Bring the hability to hold the transmit queue Miquel Raynal
2022-05-15 22:19 ` Alexander Aring
2022-05-17 9:27 ` Miquel Raynal
2022-05-17 13:19 ` Alexander Aring
2022-05-17 13:28 ` Miquel Raynal
2022-05-12 14:33 ` [PATCH wpan-next v2 06/11] net: mac802154: Create a hot tx path Miquel Raynal
2022-05-12 14:33 ` [PATCH wpan-next v2 07/11] net: mac802154: Introduce a helper to disable the queue Miquel Raynal
2022-05-12 14:33 ` [PATCH wpan-next v2 08/11] net: mac802154: Introduce a tx queue flushing mechanism Miquel Raynal
2022-05-15 22:23 ` Alexander Aring
2022-05-17 13:20 ` Miquel Raynal
2022-05-12 14:33 ` [PATCH wpan-next v2 09/11] net: mac802154: Introduce a synchronous API for MLME commands Miquel Raynal
2022-05-15 22:28 ` Alexander Aring
2022-05-15 22:56 ` Alexander Aring
2022-05-15 23:03 ` Alexander Aring
2022-05-17 13:30 ` Miquel Raynal
2022-05-18 1:14 ` Alexander Aring
2022-05-18 10:12 ` Miquel Raynal
2022-05-18 12:05 ` Alexander Aring
2022-05-18 12:37 ` Miquel Raynal
2022-05-18 13:08 ` Alexander Aring
2022-05-18 16:12 ` Miquel Raynal
2022-05-19 1:51 ` Alexander Aring
2022-05-19 14:20 ` Miquel Raynal
2022-05-12 14:33 ` [PATCH wpan-next v2 10/11] net: mac802154: Add a warning in the hot path Miquel Raynal
2022-05-15 22:30 ` Alexander Aring
2022-05-17 13:36 ` Miquel Raynal
2022-05-17 14:52 ` Miquel Raynal
2022-05-18 0:59 ` Alexander Aring
2022-05-18 9:13 ` Miquel Raynal
2022-05-12 14:33 ` [PATCH wpan-next v2 11/11] net: mac802154: Add a warning in the slow path Miquel Raynal
2022-05-15 22:30 ` Alexander Aring
2022-05-17 13:45 ` Miquel Raynal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220512143314.235604-3-miquel.raynal@bootlin.com \
--to=miquel.raynal@bootlin.com \
--cc=alex.aring@gmail.com \
--cc=davem@davemloft.net \
--cc=david.girault@qorvo.com \
--cc=frederic.blain@qorvo.com \
--cc=kuba@kernel.org \
--cc=linux-wpan@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nico@ni.fr.eu.org \
--cc=pabeni@redhat.com \
--cc=romuald.despres@qorvo.com \
--cc=stefan@datenfreihafen.org \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).