From: Philippe Gerum <rpm@xenomai.org>
To: Florian Bezdeka <florian.bezdeka@siemens.com>
Cc: xenomai@lists.linux.dev, Jan Kiszka <jan.kiszka@siemens.com>
Subject: Re: [PATCH Dovetail 6.19] e1000e: Fix merge mistake, reintroduce FLAG2_IN_NETPOLL
Date: Thu, 26 Feb 2026 18:00:43 +0100 [thread overview]
Message-ID: <87ikbjwibo.fsf@xenomai.org> (raw)
In-Reply-To: <20260225151413.1929834-1-florian.bezdeka@siemens.com> (Florian Bezdeka's message of "Wed, 25 Feb 2026 16:14:13 +0100")
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.
prev parent reply other threads:[~2026-02-26 17:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=87ikbjwibo.fsf@xenomai.org \
--to=rpm@xenomai.org \
--cc=florian.bezdeka@siemens.com \
--cc=jan.kiszka@siemens.com \
--cc=xenomai@lists.linux.dev \
/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