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.c b35a6fd37a00 ("hinic3: Add adaptive IRQ coalescing with DIM") fb2bb2a1ebf7 ("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.c 31707572108d ("wifi: ath12k: Fix wrong P2P device link id issue") c26f294fef2a ("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.c 8b8d6ee53dfd ("wifi: ath12k: Fix scan state stuck in ABORTING after cancel_remain_on_channel") 914c890d3b90 ("wifi: ath12k: Add framework for hardware specific ieee80211_ops registration")

Jakub Kicinski committed 9 months ago

Commit 9abf2202 parents 0b87bbf 0a80e38425 files · +4715 −2343Browse files

Showing the changes to include/uapi (5 of 425 files). Show all

Unified · Split

5 files

include/uapi/linux/dev_energymodel.h +82 −0
include/uapi/linux/energy_model.h +0 −63
include/uapi/linux/ext4.h +1 −1
include/uapi/linux/landlock.h +17 −20
include/uapi/linux/nl80211.h +3 −2

include/uapi/linux/dev_energymodel.h+82−0

@@ -0,0 +1,82 @@
	1	+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
	2	+/* Do not edit directly, auto-generated from: */
	3	+/* Documentation/netlink/specs/dev-energymodel.yaml */
	4	+/* YNL-GEN uapi header */
	5	+/* To regenerate run: tools/net/ynl/ynl-regen.sh */
	6	+
	7	+#ifndef _UAPI_LINUX_DEV_ENERGYMODEL_H
	8	+#define _UAPI_LINUX_DEV_ENERGYMODEL_H
	9	+
	10	+#define DEV_ENERGYMODEL_FAMILY_NAME "dev-energymodel"
	11	+#define DEV_ENERGYMODEL_FAMILY_VERSION 1
	12	+
	13	+/**
	14	+ * enum dev_energymodel_perf_state_flags
	15	+ * @DEV_ENERGYMODEL_PERF_STATE_FLAGS_PERF_STATE_INEFFICIENT: The performance
	16	+ * state is inefficient. There is in this perf-domain, another performance
	17	+ * state with a higher frequency but a lower or equal power cost.
	18	+ */
	19	+enum dev_energymodel_perf_state_flags {
	20	+ DEV_ENERGYMODEL_PERF_STATE_FLAGS_PERF_STATE_INEFFICIENT = 1,
	21	+};
	22	+
	23	+/**
	24	+ * enum dev_energymodel_perf_domain_flags
	25	+ * @DEV_ENERGYMODEL_PERF_DOMAIN_FLAGS_PERF_DOMAIN_MICROWATTS: The power values
	26	+ * are in micro-Watts or some other scale.
	27	+ * @DEV_ENERGYMODEL_PERF_DOMAIN_FLAGS_PERF_DOMAIN_SKIP_INEFFICIENCIES: Skip
	28	+ * inefficient states when estimating energy consumption.
	29	+ * @DEV_ENERGYMODEL_PERF_DOMAIN_FLAGS_PERF_DOMAIN_ARTIFICIAL: The power values
	30	+ * are artificial and might be created by platform missing real power
	31	+ * information.
	32	+ */
	33	+enum dev_energymodel_perf_domain_flags {
	34	+ DEV_ENERGYMODEL_PERF_DOMAIN_FLAGS_PERF_DOMAIN_MICROWATTS = 1,
	35	+ DEV_ENERGYMODEL_PERF_DOMAIN_FLAGS_PERF_DOMAIN_SKIP_INEFFICIENCIES = 2,
	36	+ DEV_ENERGYMODEL_PERF_DOMAIN_FLAGS_PERF_DOMAIN_ARTIFICIAL = 4,
	37	+};
	38	+
	39	+enum {
	40	+ DEV_ENERGYMODEL_A_PERF_DOMAIN_PAD = 1,
	41	+ DEV_ENERGYMODEL_A_PERF_DOMAIN_PERF_DOMAIN_ID,
	42	+ DEV_ENERGYMODEL_A_PERF_DOMAIN_FLAGS,
	43	+ DEV_ENERGYMODEL_A_PERF_DOMAIN_CPUS,
	44	+
	45	+ __DEV_ENERGYMODEL_A_PERF_DOMAIN_MAX,
	46	+ DEV_ENERGYMODEL_A_PERF_DOMAIN_MAX = (__DEV_ENERGYMODEL_A_PERF_DOMAIN_MAX - 1)
	47	+};
	48	+
	49	+enum {
	50	+ DEV_ENERGYMODEL_A_PERF_TABLE_PERF_DOMAIN_ID = 1,
	51	+ DEV_ENERGYMODEL_A_PERF_TABLE_PERF_STATE,
	52	+
	53	+ __DEV_ENERGYMODEL_A_PERF_TABLE_MAX,
	54	+ DEV_ENERGYMODEL_A_PERF_TABLE_MAX = (__DEV_ENERGYMODEL_A_PERF_TABLE_MAX - 1)
	55	+};
	56	+
	57	+enum {
	58	+ DEV_ENERGYMODEL_A_PERF_STATE_PAD = 1,
	59	+ DEV_ENERGYMODEL_A_PERF_STATE_PERFORMANCE,
	60	+ DEV_ENERGYMODEL_A_PERF_STATE_FREQUENCY,
	61	+ DEV_ENERGYMODEL_A_PERF_STATE_POWER,
	62	+ DEV_ENERGYMODEL_A_PERF_STATE_COST,
	63	+ DEV_ENERGYMODEL_A_PERF_STATE_FLAGS,
	64	+
	65	+ __DEV_ENERGYMODEL_A_PERF_STATE_MAX,
	66	+ DEV_ENERGYMODEL_A_PERF_STATE_MAX = (__DEV_ENERGYMODEL_A_PERF_STATE_MAX - 1)
	67	+};
	68	+
	69	+enum {
	70	+ DEV_ENERGYMODEL_CMD_GET_PERF_DOMAINS = 1,
	71	+ DEV_ENERGYMODEL_CMD_GET_PERF_TABLE,
	72	+ DEV_ENERGYMODEL_CMD_PERF_DOMAIN_CREATED,
	73	+ DEV_ENERGYMODEL_CMD_PERF_DOMAIN_UPDATED,
	74	+ DEV_ENERGYMODEL_CMD_PERF_DOMAIN_DELETED,
	75	+
	76	+ __DEV_ENERGYMODEL_CMD_MAX,
	77	+ DEV_ENERGYMODEL_CMD_MAX = (__DEV_ENERGYMODEL_CMD_MAX - 1)
	78	+};
	79	+
	80	+#define DEV_ENERGYMODEL_MCGRP_EVENT "event"
	81	+
	82	+#endif /* _UAPI_LINUX_DEV_ENERGYMODEL_H */

include/uapi/linux/energy_model.h+0−63

@@ -1,63 +0,0 @@
1		−/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
2		−/* Do not edit directly, auto-generated from: */
3		−/* Documentation/netlink/specs/em.yaml */
4		−/* YNL-GEN uapi header */
5		−/* To regenerate run: tools/net/ynl/ynl-regen.sh */
6		−
7		−#ifndef _UAPI_LINUX_ENERGY_MODEL_H
8		−#define _UAPI_LINUX_ENERGY_MODEL_H
9		−
10		−#define EM_FAMILY_NAME "em"
11		−#define EM_FAMILY_VERSION 1
12		−
13		−enum {
14		− EM_A_PDS_PD = 1,
15		−
16		− __EM_A_PDS_MAX,
17		− EM_A_PDS_MAX = (__EM_A_PDS_MAX - 1)
18		−};
19		−
20		−enum {
21		− EM_A_PD_PAD = 1,
22		− EM_A_PD_PD_ID,
23		− EM_A_PD_FLAGS,
24		− EM_A_PD_CPUS,
25		−
26		− __EM_A_PD_MAX,
27		− EM_A_PD_MAX = (__EM_A_PD_MAX - 1)
28		−};
29		−
30		−enum {
31		− EM_A_PD_TABLE_PD_ID = 1,
32		− EM_A_PD_TABLE_PS,
33		−
34		− __EM_A_PD_TABLE_MAX,
35		− EM_A_PD_TABLE_MAX = (__EM_A_PD_TABLE_MAX - 1)
36		−};
37		−
38		−enum {
39		− EM_A_PS_PAD = 1,
40		− EM_A_PS_PERFORMANCE,
41		− EM_A_PS_FREQUENCY,
42		− EM_A_PS_POWER,
43		− EM_A_PS_COST,
44		− EM_A_PS_FLAGS,
45		−
46		− __EM_A_PS_MAX,
47		− EM_A_PS_MAX = (__EM_A_PS_MAX - 1)
48		−};
49		−
50		−enum {
51		− EM_CMD_GET_PDS = 1,
52		− EM_CMD_GET_PD_TABLE,
53		− EM_CMD_PD_CREATED,
54		− EM_CMD_PD_UPDATED,
55		− EM_CMD_PD_DELETED,
56		−
57		− __EM_CMD_MAX,
58		− EM_CMD_MAX = (__EM_CMD_MAX - 1)
59		−};
60		−
61		−#define EM_MCGRP_EVENT "event"
62		−
63		−#endif /* _UAPI_LINUX_ENERGY_MODEL_H */

include/uapi/linux/ext4.h+1−1

@@ -139,7 +139,7 @@ struct ext4_tune_sb_params { · 138 unmodified lines
139	139	__u32 clear_feature_incompat_mask;
140	140	__u32 clear_feature_ro_compat_mask;
141	141	__u8 mount_opts[64];
142		− __u8 pad[64];
	142	+ __u8 pad[68];
143	143	};
144	144
145	145	#define EXT4_TUNE_FL_ERRORS_BEHAVIOR 0x00000001

include/uapi/linux/landlock.h+17−20

@@ -216,6 +216,23 @@ struct landlock_net_port_attr { · 215 unmodified lines
216	216	* :manpage:`ftruncate(2)`, :manpage:`creat(2)`, or :manpage:`open(2)` with
217	217	* ``O_TRUNC``. This access right is available since the third version of the
218	218	* Landlock ABI.
	219	+ * - %LANDLOCK_ACCESS_FS_IOCTL_DEV: Invoke :manpage:`ioctl(2)` commands on an opened
	220	+ * character or block device.
	221	+ *
	222	+ * This access right applies to all `ioctl(2)` commands implemented by device
	223	+ * drivers. However, the following common IOCTL commands continue to be
	224	+ * invokable independent of the %LANDLOCK_ACCESS_FS_IOCTL_DEV right:
	225	+ *
	226	+ * * IOCTL commands targeting file descriptors (``FIOCLEX``, ``FIONCLEX``),
	227	+ * * IOCTL commands targeting file descriptions (``FIONBIO``, ``FIOASYNC``),
	228	+ * * IOCTL commands targeting file systems (``FIFREEZE``, ``FITHAW``,
	229	+ * ``FIGETBSZ``, ``FS_IOC_GETFSUUID``, ``FS_IOC_GETFSSYSFSPATH``)
	230	+ * * Some IOCTL commands which do not make sense when used with devices, but
	231	+ * whose implementations are safe and return the right error codes
	232	+ * (``FS_IOC_FIEMAP``, ``FICLONE``, ``FICLONERANGE``, ``FIDEDUPERANGE``)
	233	+ *
	234	+ * This access right is available since the fifth version of the Landlock
	235	+ * ABI.
219	236	*
220	237	* Whether an opened file can be truncated with :manpage:`ftruncate(2)` or used
221	238	* with `ioctl(2)` is determined during :manpage:`open(2)`, in the same way as
@@ -275,26 +292,6 @@ struct landlock_net_port_attr { · 53 unmodified lines
275	292	* If multiple requirements are not met, the ``EACCES`` error code takes
276	293	* precedence over ``EXDEV``.
277	294	*
278		− * The following access right applies both to files and directories:
279		− *
280		− * - %LANDLOCK_ACCESS_FS_IOCTL_DEV: Invoke :manpage:`ioctl(2)` commands on an opened
281		− * character or block device.
282		− *
283		− * This access right applies to all `ioctl(2)` commands implemented by device
284		− * drivers. However, the following common IOCTL commands continue to be
285		− * invokable independent of the %LANDLOCK_ACCESS_FS_IOCTL_DEV right:
286		− *
287		− * * IOCTL commands targeting file descriptors (``FIOCLEX``, ``FIONCLEX``),
288		− * * IOCTL commands targeting file descriptions (``FIONBIO``, ``FIOASYNC``),
289		− * * IOCTL commands targeting file systems (``FIFREEZE``, ``FITHAW``,
290		− * ``FIGETBSZ``, ``FS_IOC_GETFSUUID``, ``FS_IOC_GETFSSYSFSPATH``)
291		− * * Some IOCTL commands which do not make sense when used with devices, but
292		− * whose implementations are safe and return the right error codes
293		− * (``FS_IOC_FIEMAP``, ``FICLONE``, ``FICLONERANGE``, ``FIDEDUPERANGE``)
294		− *
295		− * This access right is available since the fifth version of the Landlock
296		− * ABI.
297		− *
298	295	* .. warning::
299	296	*
300	297	* It is currently not possible to restrict some file-related actions

include/uapi/linux/nl80211.h+3−2

@@ -2880,8 +2880,9 @@ enum nl80211_commands { · 2879 unmodified lines
2880	2880	* index. If the userspace includes more RNR elements than number of
2881	2881	* MBSSID elements then these will be added in every EMA beacon.
2882	2882	*
2883		− * @NL80211_ATTR_MLO_LINK_DISABLED: Flag attribute indicating that the link is
2884		− * disabled.
	2883	+ * @NL80211_ATTR_MLO_LINK_DISABLED: Unused. It was used to indicate that a link
	2884	+ * is disabled during association. However, the AP will send the
	2885	+ * information by including a TTLM in the association response.
2885	2886	*
2886	2887	* @NL80211_ATTR_BSS_DUMP_INCLUDE_USE_DATA: Include BSS usage data, i.e.
2887	2888	* include BSSes that can only be used in restricted scenarios and/or

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code