On Thu, Oct 19, 2023 at 03:16:41PM +0200, Kory Maincent wrote:
> This reverts commit 108a36d07c01edbc5942d27c92494d1c6e4d45a0.
>
> It was reported that this fix breaks the possibility to remove existing WoL
> flags. For example:
> ~$ ethtool lan2
> ...
> Supports Wake-on: pg
> Wake-on: d
> ...
> ~$ ethtool -s lan2 wol gp
> ~$ ethtool lan2
> ...
> Wake-on: pg
> ...
> ~$ ethtool -s lan2 wol d
> ~$ ethtool lan2
> ...
> Wake-on: pg
> ...
>
> This worked correctly before this commit because we were always updating
> a zero bitmap (since commit 6699170376ab ("ethtool: fix application of
> verbose no_mask bitset"), that is) so that the rest was left zero
> naturally. But now the 1->0 change (old_val is true, bit not present in
> netlink nest) no longer works.
>
> Reported-by: Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx>
> Reported-by: Michal Kubecek <mkubecek@xxxxxxx>
> Closes: https://lore.kernel.org/netdev/20231019095140.l6fffnszraeb6iiw@xxxxxxxxxxxxxx/
> Cc: stable@xxxxxxxxxxxxxxx
> Fixes: 108a36d07c01 ("ethtool: Fix mod state of verbose no_mask bitset")
> Signed-off-by: Kory Maincent <kory.maincent@xxxxxxxxxxx>
Reviewed-by: Michal Kubecek <mkubecek@xxxxxxx>
> ---
>
> This patch is reverted for now as we are approaching the end of the
> merge-window. The real fix that fix the mod value will be sent later
> on the next merge-window.
> ---
For the record, the term "merge window" is used for the 2-week interval
between a final and following rc1, not for the whole interval between
two final releases.
Michal
Attachment:
signature.asc
Description: PGP signature
