diff options
author | 2024-03-11 20:37:53 -0700 | |
---|---|---|
committer | 2024-03-11 20:38:36 -0700 | |
commit | ed1f164038b50c5864aa85389f3ffd456f050cca (patch) | |
tree | f0f9d0fd52a798fbe3450d3d85795346411003a6 /net/devlink | |
parent | Merge branch 'nexthop-fix-two-nexthop-group-statistics-issues' (diff) | |
parent | nfp: flower: handle acti_netdevs allocation failure (diff) | |
download | wireguard-linux-ed1f164038b50c5864aa85389f3ffd456f050cca.tar.xz wireguard-linux-ed1f164038b50c5864aa85389f3ffd456f050cca.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.9 net-next PR.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/devlink')
-rw-r--r-- | net/devlink/netlink_gen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/devlink/netlink_gen.c b/net/devlink/netlink_gen.c index c81cf2dd154f..f9786d51f68f 100644 --- a/net/devlink/netlink_gen.c +++ b/net/devlink/netlink_gen.c @@ -198,7 +198,7 @@ static const struct nla_policy devlink_eswitch_set_nl_policy[DEVLINK_ATTR_ESWITC [DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, }, [DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, }, [DEVLINK_ATTR_ESWITCH_MODE] = NLA_POLICY_MAX(NLA_U16, 1), - [DEVLINK_ATTR_ESWITCH_INLINE_MODE] = NLA_POLICY_MAX(NLA_U16, 3), + [DEVLINK_ATTR_ESWITCH_INLINE_MODE] = NLA_POLICY_MAX(NLA_U8, 3), [DEVLINK_ATTR_ESWITCH_ENCAP_MODE] = NLA_POLICY_MAX(NLA_U8, 1), }; |