[PATCH net-next 00/10] netlink: specs: enum alignment fixes

[PATCH net-next 00/10] netlink: specs: enum alignment fixes

[Asbjørn Sloth Tønnesen]

This series fixes misalignment issues in YNL-defined enums or flags.

While this is not a direct continuation, the rt-link changes was
previously posted as part of another RFC:
https://lore.kernel.org/netdev/20260910221733.1021864-1-ast@fiberby.net/

Asbjørn Sloth Tønnesen (10):
  netlink: specs: rt-link: re-align IPv4 devconf
  netlink: specs: rt-link: re-align ifla-inet6-stats
  netlink: specs: rt-link: fix ifinfo-flags names
  netlink: specs: rt-link: fix netkit-policy names
  netlink: specs: devlink: fix resource-scope type
  netlink: specs: ethtool: re-align c33-pse-ext-state
  netlink: specs: ethtool: re-align module-fw-flash-status
  netlink: specs: nl80211: fix naming of enum members
  netlink: specs: tc: fix typo in cls-flags
  netlink: specs: fix incorrect name-prefixes

 Documentation/netlink/specs/devlink.yaml |  2 +-
 Documentation/netlink/specs/ethtool.yaml |  4 ++-
 Documentation/netlink/specs/nl80211.yaml |  4 +--
 Documentation/netlink/specs/rt-link.yaml | 37 +++++++++++++-----------
 Documentation/netlink/specs/tc.yaml      |  2 +-
 5 files changed, 27 insertions(+), 22 deletions(-)


base-commit: 17d3afadf539c93def8106bbb83c88274bdc7ab1
-- 
2.55.0

[PATCH net-next 01/10] netlink: specs: rt-link: re-align IPv4 devconf

[Asbjørn Sloth Tønnesen]

The YNL "ipv4-devconf" enum is misaligned with the IPV4_DEVCONF_* enum.

IPV4_DEVCONF_* starts at 1, ipv4-devconf starts at 0.

$ git grep -B3 -A1 IPV4_DEVCONF_FORWARDING include/
inc../uapi/linux/ip.h-/* index values for the variables in ipv4_devconf */
inc../uapi/linux/ip.h-enum
inc../uapi/linux/ip.h-{
inc../uapi/linux/ip.h:        IPV4_DEVCONF_FORWARDING=1,
inc../uapi/linux/ip.h-        IPV4_DEVCONF_MC_FORWARDING,

Re-align the YNL spec by explicitly setting the first value to 1.

Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
---
 Documentation/netlink/specs/rt-link.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/netlink/specs/rt-link.yaml b/Documentation/netlink/specs/rt-link.yaml
index 5217d0bb4a3a..6d5f50c8362c 100644
--- a/Documentation/netlink/specs/rt-link.yaml
+++ b/Documentation/netlink/specs/rt-link.yaml
@@ -309,6 +309,7 @@ definitions:
     entries:
       -
         name: forwarding
+        value: 1
       -
         name: mc-forwarding
       -
-- 
2.55.0

[PATCH net-next 02/10] netlink: specs: rt-link: re-align ifla-inet6-stats

[Asbjørn Sloth Tønnesen]

YNL enum ifla-inet6-stats got mis-aligned with C, as two commits
reordered the enum.

In commit b4a11b2033b7 ("net: fix IPSTATS_MIB_OUTPKGS increment in
OutForwDatagrams."), IPSTATS_MIB_OUTPKTS was renamed to _OUTREQUESTS
and a new _OUTPKTS was as the last entry.

In commit 652e2c777862 ("net: reorganize IP MIB values (II)"), the
IPSTATS_MIB_* enum was reorganized for data locality.

Neither of these commits updated the YNL spec.

This changed uAPI, as IPSTATS_MIB_* is used as indicies in an u64 array,
exported as IFLA_INET6_STATS by inet6_fill_ifla6_stats_attrs().

This patch updates ifla-inet6-stats to reflect both of these commits.
Next time we want to reorganize these counters we should properly apply
mapping as to maintain the current order on the netlink side.

This pre-existing issue was identified by Sashiko during review of
commit 2b0aecb7b2b1 ("netlink: specs: rt-link: add accept-ra-min-lft").

Reported-by: Sashiko <sashiko-bot@kernel.org>
Closes: https://sashiko.dev/#/patchset/20260831093458.472180-1-ast%40fiberby.net
Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
CC: Heng Guo <heng.guo@windriver.com>
---
 Documentation/netlink/specs/rt-link.yaml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/Documentation/netlink/specs/rt-link.yaml b/Documentation/netlink/specs/rt-link.yaml
index 6d5f50c8362c..52cac8bba0c9 100644
--- a/Documentation/netlink/specs/rt-link.yaml
+++ b/Documentation/netlink/specs/rt-link.yaml
@@ -532,11 +532,21 @@ definitions:
       -
         name: indelivers
       -
-        name: outforwdatagrams
+        name: noectpkts
+      -
+        name: ect1pkts
+      -
+        name: ect0pkts
+      -
+        name: cepkts
+      -
+        name: outrequests
       -
         name: outpkts
       -
         name: outoctets
+      -
+        name: outforwdatagrams
       -
         name: inhdrerrors
       -
@@ -587,14 +597,6 @@ definitions:
         name: outbcastoctets
       -
         name: csumerrors
-      -
-        name: noectpkts
-      -
-        name: ect1-pkts
-      -
-        name: ect0-pkts
-      -
-        name: cepkts
       -
         name: reasm-overlaps
   - name: br-boolopt-multi
-- 
2.55.0

[PATCH net-next 03/10] netlink: specs: rt-link: fix ifinfo-flags names

[Asbjørn Sloth Tønnesen]

Correct the names of `enum net_device_flags` constants:

- IFF_POINTOPOINT should be "pointopoint", not "point-to-point".
- IFF_NOTRAILERS should be "notrailers", not "no-trailers".
- IFF_NOARP should be "noarp", not "no-arp".
- IFF_ALLMULTI should be "allmulti", not "all-multi".
- IFF_AUTOMEDIA should be "automedia", not "auto-media".

Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
---
 Documentation/netlink/specs/rt-link.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/netlink/specs/rt-link.yaml b/Documentation/netlink/specs/rt-link.yaml
index 52cac8bba0c9..ac2084d14f22 100644
--- a/Documentation/netlink/specs/rt-link.yaml
+++ b/Documentation/netlink/specs/rt-link.yaml
@@ -25,17 +25,17 @@ definitions:
       -
         name: loopback
       -
-        name: point-to-point
+        name: pointopoint
       -
-        name: no-trailers
+        name: notrailers
       -
         name: running
       -
-        name: no-arp
+        name: noarp
       -
         name: promisc
       -
-        name: all-multi
+        name: allmulti
       -
         name: master
       -
@@ -45,7 +45,7 @@ definitions:
       -
         name: portsel
       -
-        name: auto-media
+        name: automedia
       -
         name: dynamic
       -
-- 
2.55.0

[PATCH net-next 04/10] netlink: specs: rt-link: fix netkit-policy names

[Asbjørn Sloth Tønnesen]

Correct the names of these `enum netkit_action` constants:

- NETKIT_PASS is 0, so "pass", not "forward".
- NETKIT_DROP is 2, so "drop", not "blackhole".

Note, the other enum members are not used in netlink, and
are not allowed by netkit_check_policy().

Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
---
 Documentation/netlink/specs/rt-link.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/netlink/specs/rt-link.yaml b/Documentation/netlink/specs/rt-link.yaml
index ac2084d14f22..e8af962c8064 100644
--- a/Documentation/netlink/specs/rt-link.yaml
+++ b/Documentation/netlink/specs/rt-link.yaml
@@ -812,10 +812,10 @@ definitions:
     enum-name:
     entries:
       -
-        name: forward
+        name: pass
         value: 0
       -
-        name: blackhole
+        name: drop
         value: 2
   -
     name: netkit-mode
-- 
2.55.0

[PATCH net-next 05/10] netlink: specs: devlink: fix resource-scope type

[Asbjørn Sloth Tønnesen]

The correct type for resource-scope is flags, not enum:

- DEVLINK_RESOURCE_SCOPE_DEV is _BITUL(0) aka. 1, not 0.
- DEVLINK_RESOURCE_SCOPE_PORT is _BITUL(1) aka. 2, not 1.

Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
CC: Cosmin Ratiu <cratiu@nvidia.com>
CC: Jiri Pirko <jiri@resnulli.us>
CC: Moshe Shemesh <moshe@nvidia.com>
CC: Or Har-Toov <ohartoov@nvidia.com>
CC: Tariq Toukan <tariqt@nvidia.com>
---
 Documentation/netlink/specs/devlink.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/netlink/specs/devlink.yaml b/Documentation/netlink/specs/devlink.yaml
index 38b1190f3d26..0b3160e201da 100644
--- a/Documentation/netlink/specs/devlink.yaml
+++ b/Documentation/netlink/specs/devlink.yaml
@@ -158,7 +158,7 @@ definitions:
       -
         name: entry
   -
-    type: enum
+    type: flags
     name: resource-scope
     entries:
       -
-- 
2.55.0

[PATCH net-next 06/10] netlink: specs: ethtool: re-align c33-pse-ext-state

[Asbjørn Sloth Tønnesen]

enum ethtool_c33_pse_ext_state is mis-aligned with YNL:

- ETHTOOL_C33_PSE_EXT_STATE_OVLD_DETECTED is 6.
- ETHTOOL_C33_PSE_EXT_STATE_PD_DLL_POWER_TYPE is 7 (not in YNL).
- ETHTOOL_C33_PSE_EXT_STATE_POWER_NOT_AVAILABLE is 8, not 7.
- ETHTOOL_C33_PSE_EXT_STATE_SHORT_DETECTED is 9, not 8.

In commit c8149739af86 ("netlink: specs: Expand the PSE netlink command
with C33 new features") the PD_DLL_POWER_TYPE enum member was skipped,
leading incorrect values for power-not-available and short-detected.

As PD_DLL_POWER_TYPE is not used, then skip it, but set the value for
power-not-available to 8.

Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
CC: Andrew Lunn <andrew@lunn.ch>
CC: Oleksij Rempel <o.rempel@pengutronix.de>
CC: "Kory Maincent (Dent Project)" <kory.maincent@bootlin.com>
---
 Documentation/netlink/specs/ethtool.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/netlink/specs/ethtool.yaml b/Documentation/netlink/specs/ethtool.yaml
index 5dd4d1b5d94b..439bf24e7c33 100644
--- a/Documentation/netlink/specs/ethtool.yaml
+++ b/Documentation/netlink/specs/ethtool.yaml
@@ -89,6 +89,7 @@ definitions:
       -
         name: power-not-available
         doc: Group of power_not_available states
+        value: 8
       -
         name: short-detected
         doc: Group of short_detected states
-- 
2.55.0

[PATCH net-next 07/10] netlink: specs: ethtool: re-align module-fw-flash-status

[Asbjørn Sloth Tønnesen]

Correct the values for enum ethtool_module_fw_flash_status:

- ETHTOOL_MODULE_FW_FLASH_STATUS_STARTED is 1, not 0.
- ETHTOOL_MODULE_FW_FLASH_STATUS_IN_PROGRESS is 2, not 1.
- ETHTOOL_MODULE_FW_FLASH_STATUS_COMPLETED is 3, not 2.
- ETHTOOL_MODULE_FW_FLASH_STATUS_ERROR is 4, not 3.

Re-align the YNL spec by explicitly setting the first value to 1.

Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
CC: Andrew Lunn <andrew@lunn.ch>
CC: Oleksij Rempel <o.rempel@pengutronix.de>
---
 Documentation/netlink/specs/ethtool.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/netlink/specs/ethtool.yaml b/Documentation/netlink/specs/ethtool.yaml
index 439bf24e7c33..6868eb473478 100644
--- a/Documentation/netlink/specs/ethtool.yaml
+++ b/Documentation/netlink/specs/ethtool.yaml
@@ -47,6 +47,7 @@ definitions:
       -
         name: started
         doc: The firmware flashing process has started.
+        value: 1
       -
         name: in-progress
         doc: The firmware flashing process is in progress.
-- 
2.55.0

[PATCH net-next 08/10] netlink: specs: nl80211: fix naming of enum members

[Asbjørn Sloth Tønnesen]

Use the correct naming for enum members:

- In feature-flags, it's NL80211_FEATURE_ND_RANDOM_MAC_ADDR,
  so "nd-random-mac-addr", not "no-random-mac-addr".

- In commands, it's NL80211_CMD_UNEXPECTED_4ADDR_FRAME,
  so "unexpected-4addr-frame", not "unexpected-4-addr-frame".

Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
CC: Joe Damato <joe@dama.to>
CC: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
CC: Shaikh Kamaluddin <shaikhkamal2012@gmail.com>
---
 Documentation/netlink/specs/nl80211.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/netlink/specs/nl80211.yaml b/Documentation/netlink/specs/nl80211.yaml
index d9fdd66b497e..efc783fb8fdf 100644
--- a/Documentation/netlink/specs/nl80211.yaml
+++ b/Documentation/netlink/specs/nl80211.yaml
@@ -97,7 +97,7 @@ definitions:
       - unexpected-frame
       - probe-client
       - register-beacons
-      - unexpected-4-addr-frame
+      - unexpected-4addr-frame
       - set-noack-map
       - ch-switch-notify
       - start-p2p-device
@@ -202,7 +202,7 @@ definitions:
       - tdls-channel-switch
       - scan-random-mac-addr
       - sched-scan-random-mac-addr
-      - no-random-mac-addr
+      - nd-random-mac-addr
   -
     name: channel-type
     type: enum
-- 
2.55.0

[PATCH net-next 09/10] netlink: specs: tc: fix typo in cls-flags

[Asbjørn Sloth Tønnesen]

Fix a typo in the naming of a cls-flags constant.

The correct name for TCA_CLS_FLAGS_NOT_IN_HW is "not-in-hw",
not "not-in-nw".

Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
CC: Jamal Hadi Salim <jhs@mojatatu.com>
CC: "Jonas Köppeler" <j.koeppeler@tu-berlin.de>
CC: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
CC: "Toke Høiland-Jørgensen" <toke@redhat.com>
---
 Documentation/netlink/specs/tc.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/netlink/specs/tc.yaml b/Documentation/netlink/specs/tc.yaml
index 2e663333a279..b6ccc645b0e3 100644
--- a/Documentation/netlink/specs/tc.yaml
+++ b/Documentation/netlink/specs/tc.yaml
@@ -42,7 +42,7 @@ definitions:
       - skip-hw
       - skip-sw
       - in-hw
-      - not-in-nw
+      - not-in-hw
       - verbose
   -
     name: flower-key-ctrl-flags
-- 
2.55.0

[PATCH net-next 10/10] netlink: specs: fix incorrect name-prefixes

[Asbjørn Sloth Tønnesen]

Fix two invalid name-prefixes in the specs:

- It's PHY_UPSTREAM_MAC, not PHY_UPSTREAMMAC.
- It's PHY_UPSTREAM_PHY, not PHY_UPSTREAMPHY.
- It's OVPN_MODE_P2P, not OVPN_MODEP2P.
- It's OVPN_MODE_MP, not OVPN_MODEMP.

Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
CC: Andrew Lunn <andrew@lunn.ch>
CC: Oleksij Rempel <o.rempel@pengutronix.de>
---
 Documentation/netlink/specs/ethtool.yaml | 2 +-
 Documentation/netlink/specs/rt-link.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/netlink/specs/ethtool.yaml b/Documentation/netlink/specs/ethtool.yaml
index 6868eb473478..a66594ad9e73 100644
--- a/Documentation/netlink/specs/ethtool.yaml
+++ b/Documentation/netlink/specs/ethtool.yaml
@@ -99,7 +99,7 @@ definitions:
     enum-name: phy-upstream
     header: linux/ethtool.h
     type: enum
-    name-prefix: phy-upstream
+    name-prefix: phy-upstream-
     entries: [mac, phy]
   -
     name: tcp-data-split
diff --git a/Documentation/netlink/specs/rt-link.yaml b/Documentation/netlink/specs/rt-link.yaml
index e8af962c8064..9743989ded2b 100644
--- a/Documentation/netlink/specs/rt-link.yaml
+++ b/Documentation/netlink/specs/rt-link.yaml
@@ -842,7 +842,7 @@ definitions:
   -
     name: ovpn-mode
     enum-name: ovpn-mode
-    name-prefix: ovpn-mode
+    name-prefix: ovpn-mode-
     type: enum
     entries:
       - p2p
-- 
2.55.0

Re: [PATCH net-next 04/10] netlink: specs: rt-link: fix netkit-policy names

[Jakub Kicinski]

On Fri, 11 Sep 2026 21:41:30 +0000 Asbjørn Sloth Tønnesen wrote:
> Correct the names of these `enum netkit_action` constants:
> 
> - NETKIT_PASS is 0, so "pass", not "forward".
> - NETKIT_DROP is 2, so "drop", not "blackhole".
> 
> Note, the other enum members are not used in netlink, and
> are not allowed by netkit_check_policy().

Looks right tho may be intentional, so the other option would be to add
#define aliases for the spec names.

CC: Nik and Daniel

> diff --git a/Documentation/netlink/specs/rt-link.yaml b/Documentation/netlink/specs/rt-link.yaml
> index ac2084d14f22..e8af962c8064 100644
> --- a/Documentation/netlink/specs/rt-link.yaml
> +++ b/Documentation/netlink/specs/rt-link.yaml
> @@ -812,10 +812,10 @@ definitions:
>      enum-name:
>      entries:
>        -
> -        name: forward
> +        name: pass
>          value: 0
>        -
> -        name: blackhole
> +        name: drop
>          value: 2
>    -
>      name: netkit-mode

Re: [PATCH net-next 00/10] netlink: specs: enum alignment fixes

[Jakub Kicinski]

On Fri, 11 Sep 2026 21:41:26 +0000 Asbjørn Sloth Tønnesen wrote:
> This series fixes misalignment issues in YNL-defined enums or flags.
> 
> While this is not a direct continuation, the rt-link changes was
> previously posted as part of another RFC:
> https://lore.kernel.org/netdev/20260910221733.1021864-1-ast@fiberby.net/

We can take the netkit patch out when applying, and either way:

Reviewed-by: Jakub Kicinski <kuba@kernel.org>

Thanks!

Re: [PATCH net-next 04/10] netlink: specs: rt-link: fix netkit-policy names

[Jakub Kicinski]

On Fri, 11 Sep 2026 15:26:29 -0700 Jakub Kicinski wrote:
> On Fri, 11 Sep 2026 21:41:30 +0000 Asbjørn Sloth Tønnesen wrote:
> > Correct the names of these `enum netkit_action` constants:
> > 
> > - NETKIT_PASS is 0, so "pass", not "forward".
> > - NETKIT_DROP is 2, so "drop", not "blackhole".
> > 
> > Note, the other enum members are not used in netlink, and
> > are not allowed by netkit_check_policy().  
> 
> Looks right tho may be intentional, so the other option would be to add
> #define aliases for the spec names.

Ah, looks like some of the selftests use "forward" by name
You'll have to fix those
-- 
pw-bot: cr

Re: [PATCH net-next 09/10] netlink: specs: tc: fix typo in cls-flags

[Toke Høiland-Jørgensen]

Asbjørn Sloth Tønnesen <ast@fiberby.net> writes:

> Fix a typo in the naming of a cls-flags constant.
>
> The correct name for TCA_CLS_FLAGS_NOT_IN_HW is "not-in-hw",
> not "not-in-nw".
>
> Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
> CC: Jamal Hadi Salim <jhs@mojatatu.com>
> CC: "Jonas Köppeler" <j.koeppeler@tu-berlin.de>
> CC: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
> CC: "Toke Høiland-Jørgensen" <toke@redhat.com>

Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com>