From: Shannon Nelson <snelson@pensando.io>
To: netdev@vger.kernel.org, davem@davemloft.net, kuba@kernel.org,
richardcochran@gmail.com
Cc: drivers@pensando.io, Shannon Nelson <snelson@pensando.io>
Subject: [PATCH net-next 3/8] ionic: check for valid tx_mode on SKBTX_HW_TSTAMP xmit
Date: Wed, 7 Apr 2021 16:19:56 -0700 [thread overview]
Message-ID: <20210407232001.16670-4-snelson@pensando.io> (raw)
In-Reply-To: <20210407232001.16670-1-snelson@pensando.io>
Make sure the device is in a Tx offload mode before calling the
hwstamp offload xmit.
Signed-off-by: Shannon Nelson <snelson@pensando.io>
---
drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
index 3478b0f2495f..765050a5f7a8 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
@@ -1233,7 +1233,7 @@ netdev_tx_t ionic_start_xmit(struct sk_buff *skb, struct net_device *netdev)
}
if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP))
- if (lif->hwstamp_txq)
+ if (lif->hwstamp_txq && lif->phc->ts_config_tx_mode)
return ionic_start_hwstamp_xmit(skb, netdev);
if (unlikely(queue_index >= lif->nxqs))
--
2.17.1
next prev parent reply other threads:[~2021-04-07 23:20 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 23:19 [PATCH net-next 0/8] ionic: hwstamp tweaks Shannon Nelson
2021-04-07 23:19 ` [PATCH net-next 1/8] ionic: fix up a couple of code style nits Shannon Nelson
2021-04-07 23:19 ` [PATCH net-next 2/8] ionic: remove unnecessary compat ifdef Shannon Nelson
2021-04-07 23:19 ` Shannon Nelson [this message]
2021-04-07 23:19 ` [PATCH net-next 4/8] ionic: add SKBTX_IN_PROGRESS Shannon Nelson
2021-04-07 23:19 ` [PATCH net-next 5/8] ionic: re-start ptp after queues up Shannon Nelson
2021-04-07 23:19 ` [PATCH net-next 6/8] ionic: ignore EBUSY on queue start Shannon Nelson
2021-04-07 23:20 ` [PATCH net-next 7/8] ionic: add ts_config replay Shannon Nelson
2021-04-07 23:20 ` [PATCH net-next 8/8] ionic: extend ts_config set locking Shannon Nelson
2021-04-08 20:30 ` [PATCH net-next 0/8] ionic: hwstamp tweaks patchwork-bot+netdevbpf
2021-04-11 15:38 ` Richard Cochran
2021-04-12 16:33 ` Shannon Nelson
2021-04-13 1:25 ` Richard Cochran
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=20210407232001.16670-4-snelson@pensando.io \
--to=snelson@pensando.io \
--cc=davem@davemloft.net \
--cc=drivers@pensando.io \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.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).