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
Cc: fushi.peng@nxp.com, devicetree@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
imx@lists.linux.dev
Subject: [PATCH net-next 10/12] net: enetc: remove unnecessary CONFIG_FSL_ENETC_PTP_CLOCK check
Date: Fri, 11 Jul 2025 14:57:46 +0800 [thread overview]
Message-ID: <20250711065748.250159-11-wei.fang@nxp.com> (raw)
In-Reply-To: <20250711065748.250159-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>
---
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-07-11 7:18 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-11 6:57 [PATCH net-next 00/12] Add NETC Timer PTP driver and add PTP support for ENETC v4 Wei Fang
2025-07-11 6:57 ` [PATCH net-next 01/12] dt-bindings: ptp: add bindings for NETC Timer Wei Fang
2025-07-11 13:27 ` Andrew Lunn
2025-07-14 2:32 ` Wei Fang
2025-07-14 5:51 ` Krzysztof Kozlowski
2025-07-14 7:32 ` Wei Fang
2025-07-14 7:35 ` Krzysztof Kozlowski
2025-07-14 9:11 ` Wei Fang
2025-07-14 9:14 ` Krzysztof Kozlowski
2025-07-14 9:56 ` Wei Fang
2025-07-14 10:09 ` Krzysztof Kozlowski
2025-07-14 10:20 ` Krzysztof Kozlowski
2025-07-14 10:30 ` Wei Fang
2025-07-14 10:28 ` Wei Fang
2025-07-14 10:31 ` Vladimir Oltean
2025-07-14 10:43 ` Wei Fang
2025-07-14 11:37 ` Vladimir Oltean
2025-07-14 13:22 ` Wei Fang
2025-07-14 13:56 ` Vladimir Oltean
2025-07-14 14:14 ` Vladimir Oltean
2025-07-15 2:52 ` Wei Fang
2025-07-15 7:02 ` Vladimir Oltean
2025-07-15 7:11 ` Wei Fang
2025-07-14 11:24 ` Krzysztof Kozlowski
2025-07-14 13:43 ` Wei Fang
2025-07-14 14:04 ` Krzysztof Kozlowski
2025-07-11 6:57 ` [PATCH net-next 02/12] ptp: netc: add NETC Timer PTP driver support Wei Fang
2025-07-11 13:25 ` Andrew Lunn
2025-07-14 2:29 ` Wei Fang
2025-07-12 10:43 ` Vadim Fedorenko
2025-07-14 2:57 ` Wei Fang
2025-07-12 11:53 ` kernel test robot
2025-07-14 5:55 ` Krzysztof Kozlowski
2025-07-14 10:11 ` Wei Fang
2025-07-11 6:57 ` [PATCH net-next 03/12] ptp: netc: add PPS support Wei Fang
2025-07-12 16:00 ` kernel test robot
2025-07-11 6:57 ` [PATCH net-next 04/12] ptp: netc: add periodic pulse output support Wei Fang
2025-07-11 6:57 ` [PATCH net-next 05/12] ptp: netc: add external trigger stamp support Wei Fang
2025-07-11 6:57 ` [PATCH net-next 06/12] ptp: netc: add debugfs support to loop back pulse signal Wei Fang
2025-07-11 13:33 ` Andrew Lunn
2025-07-14 2:33 ` Wei Fang
2025-07-11 6:57 ` [PATCH net-next 07/12] MAINTAINERS: add NETC Timer PTP clock driver section Wei Fang
2025-07-11 6:57 ` [PATCH net-next 08/12] net: enetc: save the parsed information of PTP packet to skb->cb Wei Fang
2025-07-12 10:54 ` Vadim Fedorenko
2025-07-14 3:07 ` Wei Fang
2025-07-11 6:57 ` [PATCH net-next 09/12] net: enetc: Add enetc_update_ptp_sync_msg() to process PTP sync packet Wei Fang
2025-07-12 10:58 ` Vadim Fedorenko
2025-07-11 6:57 ` Wei Fang [this message]
2025-07-12 11:29 ` [PATCH net-next 10/12] net: enetc: remove unnecessary CONFIG_FSL_ENETC_PTP_CLOCK check Vadim Fedorenko
2025-07-11 6:57 ` [PATCH net-next 11/12] net: enetc: add PTP synchronization support for ENETC v4 Wei Fang
2025-07-12 16:42 ` kernel test robot
2025-07-11 6:57 ` [PATCH net-next 12/12] net: enetc: don't update sync packet checksum if checksum offload is used Wei Fang
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=20250711065748.250159-11-wei.fang@nxp.com \
--to=wei.fang@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=fushi.peng@nxp.com \
--cc=imx@lists.linux.dev \
--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=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
all inboxes | Powered by JetHome®