From: Wei Fang <wei.fang@nxp.com>
To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org,
richardcochran@gmail.com, claudiu.manoil@nxp.com,
vladimir.oltean@nxp.com, xiaoning.wang@nxp.com,
andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com, vadim.fedorenko@linux.dev,
Frank.Li@nxp.com, shawnguo@kernel.org, s.hauer@pengutronix.de,
festevam@gmail.com
Cc: fushi.peng@nxp.com, devicetree@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
imx@lists.linux.dev, kernel@pengutronix.de
Subject: [PATCH v3 net-next 12/15] net: enetc: remove unnecessary CONFIG_FSL_ENETC_PTP_CLOCK check
Date: Tue, 12 Aug 2025 17:46:31 +0800 [thread overview]
Message-ID: <20250812094634.489901-13-wei.fang@nxp.com> (raw)
In-Reply-To: <20250812094634.489901-1-wei.fang@nxp.com>
The ENETC_F_RX_TSTAMP flag of priv->active_offloads can only be set when
CONFIG_FSL_ENETC_PTP_CLOCK is enabled. Similarly, rx_ring->ext_en can
only be set when CONFIG_FSL_ENETC_PTP_CLOCK is enabled as well. So it is
safe to remove unnecessary CONFIG_FSL_ENETC_PTP_CLOCK check.
Signed-off-by: Wei Fang <wei.fang@nxp.com>
Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
---
drivers/net/ethernet/freescale/enetc/enetc.c | 3 +--
drivers/net/ethernet/freescale/enetc/enetc.h | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index ef002ed2fdb9..4325eb3d9481 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -1411,8 +1411,7 @@ static void enetc_get_offloads(struct enetc_bdr *rx_ring,
__vlan_hwaccel_put_tag(skb, tpid, le16_to_cpu(rxbd->r.vlan_opt));
}
- if (IS_ENABLED(CONFIG_FSL_ENETC_PTP_CLOCK) &&
- (priv->active_offloads & ENETC_F_RX_TSTAMP))
+ if (priv->active_offloads & ENETC_F_RX_TSTAMP)
enetc_get_rx_tstamp(rx_ring->ndev, rxbd, skb);
}
diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h b/drivers/net/ethernet/freescale/enetc/enetc.h
index ce3fed95091b..c65aa7b88122 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc.h
@@ -226,7 +226,7 @@ static inline union enetc_rx_bd *enetc_rxbd(struct enetc_bdr *rx_ring, int i)
{
int hw_idx = i;
- if (IS_ENABLED(CONFIG_FSL_ENETC_PTP_CLOCK) && rx_ring->ext_en)
+ if (rx_ring->ext_en)
hw_idx = 2 * i;
return &(((union enetc_rx_bd *)rx_ring->bd_base)[hw_idx]);
@@ -240,7 +240,7 @@ static inline void enetc_rxbd_next(struct enetc_bdr *rx_ring,
new_rxbd++;
- if (IS_ENABLED(CONFIG_FSL_ENETC_PTP_CLOCK) && rx_ring->ext_en)
+ if (rx_ring->ext_en)
new_rxbd++;
if (unlikely(++new_index == rx_ring->bd_count)) {
--
2.34.1
next prev parent reply other threads:[~2025-08-12 10:08 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-12 9:46 [PATCH v3 net-next 00/15] Add NETC Timer PTP driver and add PTP support for i.MX95 Wei Fang
2025-08-12 9:46 ` [PATCH v3 net-next 01/15] dt-bindings: ptp: add NETC Timer PTP clock Wei Fang
2025-08-12 14:36 ` Frank Li
2025-08-14 8:25 ` Krzysztof Kozlowski
2025-08-14 18:50 ` Frank Li
2025-08-15 6:05 ` Krzysztof Kozlowski
2025-08-15 18:11 ` Frank Li
2025-08-15 2:05 ` Wei Fang
2025-08-12 9:46 ` [PATCH v3 net-next 02/15] dt-bindings: net: add ptp-timer property Wei Fang
2025-08-12 11:18 ` Vladimir Oltean
2025-08-12 14:40 ` Frank Li
2025-08-14 8:27 ` Krzysztof Kozlowski
2025-08-12 9:46 ` [PATCH v3 net-next 03/15] dt-bindings: net: add an example for ENETC v4 Wei Fang
2025-08-12 14:38 ` Frank Li
2025-08-13 1:38 ` Wei Fang
2025-08-13 15:10 ` Frank Li
2025-08-14 1:34 ` Wei Fang
2025-08-14 8:29 ` Krzysztof Kozlowski
2025-08-12 9:46 ` [PATCH v3 net-next 04/15] ptp: netc: add NETC V4 Timer PTP driver support Wei Fang
2025-08-12 13:49 ` Vladimir Oltean
2025-08-13 2:21 ` Wei Fang
2025-08-12 15:01 ` Frank Li
2025-08-13 1:46 ` Wei Fang
2025-08-15 18:13 ` Frank Li
2025-08-13 4:45 ` kernel test robot
2025-08-12 9:46 ` [PATCH v3 net-next 05/15] ptp: netc: add PTP_CLK_REQ_PPS support Wei Fang
2025-08-12 15:11 ` Frank Li
2025-08-13 1:59 ` Wei Fang
2025-08-13 15:06 ` Frank Li
2025-08-14 2:22 ` Wei Fang
2025-08-12 9:46 ` [PATCH v3 net-next 06/15] ptp: netc: add periodic pulse output support Wei Fang
2025-08-12 12:03 ` Vladimir Oltean
2025-08-13 1:42 ` Wei Fang
2025-08-12 15:24 ` Frank Li
2025-08-13 2:35 ` kernel test robot
2025-08-12 9:46 ` [PATCH v3 net-next 07/15] ptp: netc: add external trigger stamp support Wei Fang
2025-08-12 15:27 ` Frank Li
2025-08-12 9:46 ` [PATCH v3 net-next 08/15] ptp: netc: add debugfs support to loop back pulse signal Wei Fang
2025-08-12 15:42 ` Frank Li
2025-08-12 9:46 ` [PATCH v3 net-next 09/15] MAINTAINERS: add NETC Timer PTP clock driver section Wei Fang
2025-08-12 9:46 ` [PATCH v3 net-next 10/15] net: enetc: save the parsed information of PTP packet to skb->cb Wei Fang
2025-08-12 15:45 ` Frank Li
2025-08-12 9:46 ` [PATCH v3 net-next 11/15] net: enetc: extract enetc_update_ptp_sync_msg() to handle PTP Sync packets Wei Fang
2025-08-12 15:52 ` Frank Li
2025-08-13 2:04 ` Wei Fang
2025-08-12 9:46 ` Wei Fang [this message]
2025-08-12 9:46 ` [PATCH v3 net-next 13/15] net: enetc: add PTP synchronization support for ENETC v4 Wei Fang
2025-08-12 15:58 ` Frank Li
2025-08-13 2:17 ` Wei Fang
2025-08-13 14:55 ` Frank Li
2025-08-12 9:46 ` [PATCH v3 net-next 14/15] net: enetc: don't update sync packet checksum if checksum offload is used Wei Fang
2025-08-12 9:46 ` [PATCH v3 15/15] arm64: dts: imx95: add standard PCI device compatible string to NETC Timer Wei Fang
2025-08-12 15:59 ` Frank Li
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=20250812094634.489901-13-wei.fang@nxp.com \
--to=wei.fang@nxp.com \
--cc=Frank.Li@nxp.com \
--cc=andrew+netdev@lunn.ch \
--cc=claudiu.manoil@nxp.com \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=festevam@gmail.com \
--cc=fushi.peng@nxp.com \
--cc=imx@lists.linux.dev \
--cc=kernel@pengutronix.de \
--cc=krzk+dt@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=richardcochran@gmail.com \
--cc=robh@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=vadim.fedorenko@linux.dev \
--cc=vladimir.oltean@nxp.com \
--cc=xiaoning.wang@nxp.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).