diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2026-11-12 14:49:25 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2026-11-12 14:54:47 -0800 |
| commit | 573af801552999954caa8347e4490b04cf4763f0 (patch) | |
| tree | fd6d10de2b63143b428d26dae97b6a1098a03a58 /include/uapi/linux | |
| parent | 073d54dc3ccc8c8109c56e4d984d1ad616554463 (diff) | |
| parent | 7e1392a42ea288d70a266f6553fe06f57f8647ea (diff) | |
| download | linux-next-573af801552999954caa8347e4490b04cf4763f0.tar.gz linux-next-573af801552999954caa8347e4490b04cf4763f0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-7.4-rc3).
Conflicts:
net/core/dev.c
fdca4b030c78f ("net: Segment CHECKSUM_UNNECESSARY GSO skbs other than fraglist")
f4564d298418c ("net: reset transport_header for ndo_features_check")
https://lore.kernel.org/avXGDHChG4mIw6Tl@sirena.org.uk
drivers/net/dsa/motorcomm/chip.c
4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")
a9a173f81c83e ("net: dsa: motorcomm: Free the MIB block on port teardown")
https://lore.kernel.org/avXGA_FRXwZM7ExI@sirena.org.uk
Adjacent changes:
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
8959c2030f5c ("net: stmmac: release MDIO node if bus data allocation fails")
4dd10fbbeb9c ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")
drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
edf10f5c2513 ("net: stmmac: rebuild VLAN priority steering when filters change")
4dd10fbbeb9c ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")
net/core/skbuff.c
8b67debdfbf6 ("net: skbuff: uncharge trimmed zerocopy frags on error")
ecca9bb2c855 ("net: skbuff: replace ubuf_info ops ptr with type id")
net/ipv4/ip_output.c
23fe6ac2e97a ("net: skbuff: make skb_copy_and_csum_bits() report unreadable frag
s")
0f47fce51a98 ("ipv4: keep XFRM headers out of corked skb lengths")
net/ipv6/seg6_local.c
6b290fe547c2 ("seg6: skip the route refcount in seg6local IPv4 lookups")
549484dd3e80 ("seg6: validate state in netfilter continuations")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/io_uring.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/mdio.h | 13 | ||||
| -rw-r--r-- | include/uapi/linux/nl80211.h | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index b456f45fa8de..cf1afd11bb87 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -646,6 +646,7 @@ struct io_uring_params { #define IORING_FEAT_MIN_TIMEOUT (1U << 15) #define IORING_FEAT_RW_ATTR (1U << 16) #define IORING_FEAT_NO_IOWAIT (1U << 17) +#define IORING_FEAT_REGBUF_TYPES (1U << 18) /* * io_uring_register(2) opcodes and arguments diff --git a/include/uapi/linux/mdio.h b/include/uapi/linux/mdio.h index 06f4bc3c20c7..2806f60ed105 100644 --- a/include/uapi/linux/mdio.h +++ b/include/uapi/linux/mdio.h @@ -417,8 +417,17 @@ #define MDIO_AN_10BT1_AN_STAT_LPA_EEE_T1L 0x4000 /* 10BASE-T1L LP EEE ability advertisement */ /* BASE-T1 PMA/PMD control register */ -#define MDIO_PMA_PMD_BT1_CTRL_STRAP 0x000F /* Type selection (Strap) */ -#define MDIO_PMA_PMD_BT1_CTRL_STRAP_B1000 0x0001 /* Select 1000BASE-T1 */ +#define MDIO_PMA_PMD_BT1_CTRL_TYPE_SEL 0x000F /* Type selection */ +#define MDIO_PMA_PMD_BT1_CTRL_TYPE_SEL_100BT1 0x0000 /* Select 100BASE-T1 */ +#define MDIO_PMA_PMD_BT1_CTRL_TYPE_SEL_1000BT1 0x0001 /* Select 1000BASE-T1 */ +#define MDIO_PMA_PMD_BT1_CTRL_TYPE_SEL_10BT1L 0x0002 /* Select 10BASE-T1L */ +#define MDIO_PMA_PMD_BT1_CTRL_TYPE_SEL_10BT1S 0x0003 /* Select 10BASE-T1S */ +#define MDIO_PMA_PMD_BT1_CTRL_TYPE_SEL_2P5GBT1 0x0004 /* Select 2.5GBASE-T1 */ +#define MDIO_PMA_PMD_BT1_CTRL_TYPE_SEL_5GBT1 0x0005 /* Select 5GBASE-T1 */ +#define MDIO_PMA_PMD_BT1_CTRL_TYPE_SEL_10GBT1 0x0006 /* Select 10GBASE-T1 */ +/* Legacy names, kept for userspace */ +#define MDIO_PMA_PMD_BT1_CTRL_STRAP MDIO_PMA_PMD_BT1_CTRL_TYPE_SEL +#define MDIO_PMA_PMD_BT1_CTRL_STRAP_B1000 MDIO_PMA_PMD_BT1_CTRL_TYPE_SEL_1000BT1 #define MDIO_PMA_PMD_BT1_CTRL_CFG_MST 0x4000 /* MASTER-SLAVE config value */ /* 1000BASE-T1 PCS control register */ diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index b56a96f57bec..dae8fb894a79 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -6,7 +6,7 @@ * Copyright 2006-2010 Johannes Berg <johannes@sipsolutions.net> * Copyright 2008 Michael Wu <flamingice@sourmilk.net> * Copyright 2008 Luis Carlos Cobo <luisca@cozybit.com> - * Copyright 2008 Michael Buesch <m@bues.ch> + * Copyright 2008 Michael Buesch * Copyright 2008, 2009 Luis R. Rodriguez <lrodriguez@atheros.com> * Copyright 2008 Jouni Malinen <jouni.malinen@atheros.com> * Copyright 2008 Colin McCabe <colin@cozybit.com> |