mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-29 07:19:34 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.19-rc7). Conflicts: drivers/net/ethernet/huawei/hinic3/hinic3_irq.cb35a6fd37a("hinic3: Add adaptive IRQ coalescing with DIM")fb2bb2a1eb("hinic3: Fix netif_queue_set_napi queue_index input parameter error") https://lore.kernel.org/fc0a7fdf08789a52653e8ad05281a0a849e79206.1768915707.git.zhuyikai1@h-partners.com drivers/net/wireless/ath/ath12k/mac.c drivers/net/wireless/ath/ath12k/wifi7/hw.c3170757210("wifi: ath12k: Fix wrong P2P device link id issue")c26f294fef("wifi: ath12k: Move ieee80211_ops callback to the arch specific module") https://lore.kernel.org/20260114123751.6a208818@canb.auug.org.au Adjacent changes: drivers/net/wireless/ath/ath12k/mac.c8b8d6ee53d("wifi: ath12k: Fix scan state stuck in ABORTING after cancel_remain_on_channel")914c890d3b("wifi: ath12k: Add framework for hardware specific ieee80211_ops registration") Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
82
include/uapi/linux/dev_energymodel.h
Normal file
82
include/uapi/linux/dev_energymodel.h
Normal file
@@ -0,0 +1,82 @@
|
||||
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
|
||||
/* Do not edit directly, auto-generated from: */
|
||||
/* Documentation/netlink/specs/dev-energymodel.yaml */
|
||||
/* YNL-GEN uapi header */
|
||||
/* To regenerate run: tools/net/ynl/ynl-regen.sh */
|
||||
|
||||
#ifndef _UAPI_LINUX_DEV_ENERGYMODEL_H
|
||||
#define _UAPI_LINUX_DEV_ENERGYMODEL_H
|
||||
|
||||
#define DEV_ENERGYMODEL_FAMILY_NAME "dev-energymodel"
|
||||
#define DEV_ENERGYMODEL_FAMILY_VERSION 1
|
||||
|
||||
/**
|
||||
* enum dev_energymodel_perf_state_flags
|
||||
* @DEV_ENERGYMODEL_PERF_STATE_FLAGS_PERF_STATE_INEFFICIENT: The performance
|
||||
* state is inefficient. There is in this perf-domain, another performance
|
||||
* state with a higher frequency but a lower or equal power cost.
|
||||
*/
|
||||
enum dev_energymodel_perf_state_flags {
|
||||
DEV_ENERGYMODEL_PERF_STATE_FLAGS_PERF_STATE_INEFFICIENT = 1,
|
||||
};
|
||||
|
||||
/**
|
||||
* enum dev_energymodel_perf_domain_flags
|
||||
* @DEV_ENERGYMODEL_PERF_DOMAIN_FLAGS_PERF_DOMAIN_MICROWATTS: The power values
|
||||
* are in micro-Watts or some other scale.
|
||||
* @DEV_ENERGYMODEL_PERF_DOMAIN_FLAGS_PERF_DOMAIN_SKIP_INEFFICIENCIES: Skip
|
||||
* inefficient states when estimating energy consumption.
|
||||
* @DEV_ENERGYMODEL_PERF_DOMAIN_FLAGS_PERF_DOMAIN_ARTIFICIAL: The power values
|
||||
* are artificial and might be created by platform missing real power
|
||||
* information.
|
||||
*/
|
||||
enum dev_energymodel_perf_domain_flags {
|
||||
DEV_ENERGYMODEL_PERF_DOMAIN_FLAGS_PERF_DOMAIN_MICROWATTS = 1,
|
||||
DEV_ENERGYMODEL_PERF_DOMAIN_FLAGS_PERF_DOMAIN_SKIP_INEFFICIENCIES = 2,
|
||||
DEV_ENERGYMODEL_PERF_DOMAIN_FLAGS_PERF_DOMAIN_ARTIFICIAL = 4,
|
||||
};
|
||||
|
||||
enum {
|
||||
DEV_ENERGYMODEL_A_PERF_DOMAIN_PAD = 1,
|
||||
DEV_ENERGYMODEL_A_PERF_DOMAIN_PERF_DOMAIN_ID,
|
||||
DEV_ENERGYMODEL_A_PERF_DOMAIN_FLAGS,
|
||||
DEV_ENERGYMODEL_A_PERF_DOMAIN_CPUS,
|
||||
|
||||
__DEV_ENERGYMODEL_A_PERF_DOMAIN_MAX,
|
||||
DEV_ENERGYMODEL_A_PERF_DOMAIN_MAX = (__DEV_ENERGYMODEL_A_PERF_DOMAIN_MAX - 1)
|
||||
};
|
||||
|
||||
enum {
|
||||
DEV_ENERGYMODEL_A_PERF_TABLE_PERF_DOMAIN_ID = 1,
|
||||
DEV_ENERGYMODEL_A_PERF_TABLE_PERF_STATE,
|
||||
|
||||
__DEV_ENERGYMODEL_A_PERF_TABLE_MAX,
|
||||
DEV_ENERGYMODEL_A_PERF_TABLE_MAX = (__DEV_ENERGYMODEL_A_PERF_TABLE_MAX - 1)
|
||||
};
|
||||
|
||||
enum {
|
||||
DEV_ENERGYMODEL_A_PERF_STATE_PAD = 1,
|
||||
DEV_ENERGYMODEL_A_PERF_STATE_PERFORMANCE,
|
||||
DEV_ENERGYMODEL_A_PERF_STATE_FREQUENCY,
|
||||
DEV_ENERGYMODEL_A_PERF_STATE_POWER,
|
||||
DEV_ENERGYMODEL_A_PERF_STATE_COST,
|
||||
DEV_ENERGYMODEL_A_PERF_STATE_FLAGS,
|
||||
|
||||
__DEV_ENERGYMODEL_A_PERF_STATE_MAX,
|
||||
DEV_ENERGYMODEL_A_PERF_STATE_MAX = (__DEV_ENERGYMODEL_A_PERF_STATE_MAX - 1)
|
||||
};
|
||||
|
||||
enum {
|
||||
DEV_ENERGYMODEL_CMD_GET_PERF_DOMAINS = 1,
|
||||
DEV_ENERGYMODEL_CMD_GET_PERF_TABLE,
|
||||
DEV_ENERGYMODEL_CMD_PERF_DOMAIN_CREATED,
|
||||
DEV_ENERGYMODEL_CMD_PERF_DOMAIN_UPDATED,
|
||||
DEV_ENERGYMODEL_CMD_PERF_DOMAIN_DELETED,
|
||||
|
||||
__DEV_ENERGYMODEL_CMD_MAX,
|
||||
DEV_ENERGYMODEL_CMD_MAX = (__DEV_ENERGYMODEL_CMD_MAX - 1)
|
||||
};
|
||||
|
||||
#define DEV_ENERGYMODEL_MCGRP_EVENT "event"
|
||||
|
||||
#endif /* _UAPI_LINUX_DEV_ENERGYMODEL_H */
|
||||
@@ -1,63 +0,0 @@
|
||||
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
|
||||
/* Do not edit directly, auto-generated from: */
|
||||
/* Documentation/netlink/specs/em.yaml */
|
||||
/* YNL-GEN uapi header */
|
||||
/* To regenerate run: tools/net/ynl/ynl-regen.sh */
|
||||
|
||||
#ifndef _UAPI_LINUX_ENERGY_MODEL_H
|
||||
#define _UAPI_LINUX_ENERGY_MODEL_H
|
||||
|
||||
#define EM_FAMILY_NAME "em"
|
||||
#define EM_FAMILY_VERSION 1
|
||||
|
||||
enum {
|
||||
EM_A_PDS_PD = 1,
|
||||
|
||||
__EM_A_PDS_MAX,
|
||||
EM_A_PDS_MAX = (__EM_A_PDS_MAX - 1)
|
||||
};
|
||||
|
||||
enum {
|
||||
EM_A_PD_PAD = 1,
|
||||
EM_A_PD_PD_ID,
|
||||
EM_A_PD_FLAGS,
|
||||
EM_A_PD_CPUS,
|
||||
|
||||
__EM_A_PD_MAX,
|
||||
EM_A_PD_MAX = (__EM_A_PD_MAX - 1)
|
||||
};
|
||||
|
||||
enum {
|
||||
EM_A_PD_TABLE_PD_ID = 1,
|
||||
EM_A_PD_TABLE_PS,
|
||||
|
||||
__EM_A_PD_TABLE_MAX,
|
||||
EM_A_PD_TABLE_MAX = (__EM_A_PD_TABLE_MAX - 1)
|
||||
};
|
||||
|
||||
enum {
|
||||
EM_A_PS_PAD = 1,
|
||||
EM_A_PS_PERFORMANCE,
|
||||
EM_A_PS_FREQUENCY,
|
||||
EM_A_PS_POWER,
|
||||
EM_A_PS_COST,
|
||||
EM_A_PS_FLAGS,
|
||||
|
||||
__EM_A_PS_MAX,
|
||||
EM_A_PS_MAX = (__EM_A_PS_MAX - 1)
|
||||
};
|
||||
|
||||
enum {
|
||||
EM_CMD_GET_PDS = 1,
|
||||
EM_CMD_GET_PD_TABLE,
|
||||
EM_CMD_PD_CREATED,
|
||||
EM_CMD_PD_UPDATED,
|
||||
EM_CMD_PD_DELETED,
|
||||
|
||||
__EM_CMD_MAX,
|
||||
EM_CMD_MAX = (__EM_CMD_MAX - 1)
|
||||
};
|
||||
|
||||
#define EM_MCGRP_EVENT "event"
|
||||
|
||||
#endif /* _UAPI_LINUX_ENERGY_MODEL_H */
|
||||
@@ -139,7 +139,7 @@ struct ext4_tune_sb_params {
|
||||
__u32 clear_feature_incompat_mask;
|
||||
__u32 clear_feature_ro_compat_mask;
|
||||
__u8 mount_opts[64];
|
||||
__u8 pad[64];
|
||||
__u8 pad[68];
|
||||
};
|
||||
|
||||
#define EXT4_TUNE_FL_ERRORS_BEHAVIOR 0x00000001
|
||||
|
||||
@@ -216,6 +216,23 @@ struct landlock_net_port_attr {
|
||||
* :manpage:`ftruncate(2)`, :manpage:`creat(2)`, or :manpage:`open(2)` with
|
||||
* ``O_TRUNC``. This access right is available since the third version of the
|
||||
* Landlock ABI.
|
||||
* - %LANDLOCK_ACCESS_FS_IOCTL_DEV: Invoke :manpage:`ioctl(2)` commands on an opened
|
||||
* character or block device.
|
||||
*
|
||||
* This access right applies to all `ioctl(2)` commands implemented by device
|
||||
* drivers. However, the following common IOCTL commands continue to be
|
||||
* invokable independent of the %LANDLOCK_ACCESS_FS_IOCTL_DEV right:
|
||||
*
|
||||
* * IOCTL commands targeting file descriptors (``FIOCLEX``, ``FIONCLEX``),
|
||||
* * IOCTL commands targeting file descriptions (``FIONBIO``, ``FIOASYNC``),
|
||||
* * IOCTL commands targeting file systems (``FIFREEZE``, ``FITHAW``,
|
||||
* ``FIGETBSZ``, ``FS_IOC_GETFSUUID``, ``FS_IOC_GETFSSYSFSPATH``)
|
||||
* * Some IOCTL commands which do not make sense when used with devices, but
|
||||
* whose implementations are safe and return the right error codes
|
||||
* (``FS_IOC_FIEMAP``, ``FICLONE``, ``FICLONERANGE``, ``FIDEDUPERANGE``)
|
||||
*
|
||||
* This access right is available since the fifth version of the Landlock
|
||||
* ABI.
|
||||
*
|
||||
* Whether an opened file can be truncated with :manpage:`ftruncate(2)` or used
|
||||
* with `ioctl(2)` is determined during :manpage:`open(2)`, in the same way as
|
||||
@@ -275,26 +292,6 @@ struct landlock_net_port_attr {
|
||||
* If multiple requirements are not met, the ``EACCES`` error code takes
|
||||
* precedence over ``EXDEV``.
|
||||
*
|
||||
* The following access right applies both to files and directories:
|
||||
*
|
||||
* - %LANDLOCK_ACCESS_FS_IOCTL_DEV: Invoke :manpage:`ioctl(2)` commands on an opened
|
||||
* character or block device.
|
||||
*
|
||||
* This access right applies to all `ioctl(2)` commands implemented by device
|
||||
* drivers. However, the following common IOCTL commands continue to be
|
||||
* invokable independent of the %LANDLOCK_ACCESS_FS_IOCTL_DEV right:
|
||||
*
|
||||
* * IOCTL commands targeting file descriptors (``FIOCLEX``, ``FIONCLEX``),
|
||||
* * IOCTL commands targeting file descriptions (``FIONBIO``, ``FIOASYNC``),
|
||||
* * IOCTL commands targeting file systems (``FIFREEZE``, ``FITHAW``,
|
||||
* ``FIGETBSZ``, ``FS_IOC_GETFSUUID``, ``FS_IOC_GETFSSYSFSPATH``)
|
||||
* * Some IOCTL commands which do not make sense when used with devices, but
|
||||
* whose implementations are safe and return the right error codes
|
||||
* (``FS_IOC_FIEMAP``, ``FICLONE``, ``FICLONERANGE``, ``FIDEDUPERANGE``)
|
||||
*
|
||||
* This access right is available since the fifth version of the Landlock
|
||||
* ABI.
|
||||
*
|
||||
* .. warning::
|
||||
*
|
||||
* It is currently not possible to restrict some file-related actions
|
||||
|
||||
@@ -2880,8 +2880,9 @@ enum nl80211_commands {
|
||||
* index. If the userspace includes more RNR elements than number of
|
||||
* MBSSID elements then these will be added in every EMA beacon.
|
||||
*
|
||||
* @NL80211_ATTR_MLO_LINK_DISABLED: Flag attribute indicating that the link is
|
||||
* disabled.
|
||||
* @NL80211_ATTR_MLO_LINK_DISABLED: Unused. It was used to indicate that a link
|
||||
* is disabled during association. However, the AP will send the
|
||||
* information by including a TTLM in the association response.
|
||||
*
|
||||
* @NL80211_ATTR_BSS_DUMP_INCLUDE_USE_DATA: Include BSS usage data, i.e.
|
||||
* include BSSes that can only be used in restricted scenarios and/or
|
||||
|
||||
Reference in New Issue
Block a user