* [PATCH Dovetail 6.19] e1000e: Fix merge mistake, reintroduce FLAG2_IN_NETPOLL
@ 2026-02-25 15:14 Florian Bezdeka
2026-02-26 17:00 ` Philippe Gerum
0 siblings, 1 reply; 2+ messages in thread
From: Florian Bezdeka @ 2026-02-25 15:14 UTC (permalink / raw)
To: xenomai; +Cc: Jan Kiszka, Philippe Gerum, Florian Bezdeka
Seems I miss-interpreted the change while forward porting as a rename.
But: It's two flags using the same bit().
Reintroducing FLAG2_IN_NETPOLL to make the e1000e driver buildable
again.
Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
---
drivers/net/ethernet/intel/e1000e/e1000.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index 200ab51b07c8e..7e08444efd932 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -501,6 +501,7 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca);
#define FLAG2_CHECK_SYSTIM_OVERFLOW BIT(14)
#define FLAG2_ENABLE_S0IX_FLOWS BIT(15)
#define FLAG2_DISABLE_K1 BIT(16)
+#define FLAG2_IN_NETPOLL BIT(17)
#define E1000_RX_DESC_PS(R, i) \
(&(((union e1000_rx_desc_packet_split *)((R).desc))[i]))
--
2.53.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH Dovetail 6.19] e1000e: Fix merge mistake, reintroduce FLAG2_IN_NETPOLL
2026-02-25 15:14 [PATCH Dovetail 6.19] e1000e: Fix merge mistake, reintroduce FLAG2_IN_NETPOLL Florian Bezdeka
@ 2026-02-26 17:00 ` Philippe Gerum
0 siblings, 0 replies; 2+ messages in thread
From: Philippe Gerum @ 2026-02-26 17:00 UTC (permalink / raw)
To: Florian Bezdeka; +Cc: xenomai, Jan Kiszka
Florian Bezdeka <florian.bezdeka@siemens.com> writes:
> Seems I miss-interpreted the change while forward porting as a rename.
> But: It's two flags using the same bit().
>
> Reintroducing FLAG2_IN_NETPOLL to make the e1000e driver buildable
> again.
>
> Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com>
> ---
> drivers/net/ethernet/intel/e1000e/e1000.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
> index 200ab51b07c8e..7e08444efd932 100644
> --- a/drivers/net/ethernet/intel/e1000e/e1000.h
> +++ b/drivers/net/ethernet/intel/e1000e/e1000.h
> @@ -501,6 +501,7 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca);
> #define FLAG2_CHECK_SYSTIM_OVERFLOW BIT(14)
> #define FLAG2_ENABLE_S0IX_FLOWS BIT(15)
> #define FLAG2_DISABLE_K1 BIT(16)
> +#define FLAG2_IN_NETPOLL BIT(17)
>
> #define E1000_RX_DESC_PS(R, i) \
> (&(((union e1000_rx_desc_packet_split *)((R).desc))[i]))
Merged, thanks.
--
Philippe.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-02-26 17:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-25 15:14 [PATCH Dovetail 6.19] e1000e: Fix merge mistake, reintroduce FLAG2_IN_NETPOLL Florian Bezdeka
2026-02-26 17:00 ` Philippe Gerum
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.