Pull networking fixes from Jakub Kicinski: "Networking fixes, including fixes from netfilter, wireless and bpf trees. Current release - regressions: - mt76: fix NULL pointer dereference in mt76u_status_worker and mt76s_process_tx_queue - net: ipa: fix interconnect enable bug Current release - always broken: - netfilter: fixes possible oops in mtype_resize in ipset - ath11k: fix number of coding issues found by static analysis tools and spurious error messages Previous releases - regressions: - e1000e: re-enable s0ix power saving flows for systems with the Intel i219-LM Ethernet controllers to fix power use regression - virtio_net: fix recursive call to cpus_read_lock() to avoid a deadlock - ipv4: ignore ECN bits for fib lookups in fib_compute_spec_dst() - sysfs: take the rtnl lock around XPS configuration - xsk: fix memory leak for failed bind and rollback reservation at NETDEV_TX_BUSY - r8169: work around power-saving bug on some chip versions Previous releases - always broken: - dcb: validate netlink message in DCB handler - tun: fix return value when the number of iovs exceeds MAX_SKB_FRAGS to prevent unnecessary retries - vhost_net: fix ubuf refcount when sendmsg fails - bpf: save correct stopping point in file seq iteration - ncsi: use real net-device for response handler - neighbor: fix div by zero caused by a data race (TOCTOU) - bareudp: fix use of incorrect min_headroom size and a false positive lockdep splat from the TX lock - mvpp2: - clear force link UP during port init procedure in case bootloader had set it - add TCAM entry to drop flow control pause frames - fix PPPoE with ipv6 packet parsing - fix GoP Networking Complex Control config of port 3 - fix pkt coalescing IRQ-threshold configuration - xsk: fix race in SKB mode transmit with shared cq - ionic: account for vlan tag len in rx buffer len - stmmac: ignore the second clock input, current clock framework does not handle exclusive clock use well, other drivers may reconfigure the second clock Misc: - ppp: change PPPIOCUNBRIDGECHAN ioctl request number to follow existing scheme" * tag 'net-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (99 commits) net: dsa: lantiq_gswip: Fix GSWIP_MII_CFG(p) register access net: dsa: lantiq_gswip: Enable GSWIP_MII_CFG_EN also for internal PHYs net: lapb: Decrease the refcount of "struct lapb_cb" in lapb_device_event r8169: work around power-saving bug on some chip versions net: usb: qmi_wwan: add Quectel EM160R-GL selftests: mlxsw: Set headroom size of correct port net: macb: Correct usage of MACB_CAPS_CLK_HW_CHG flag ibmvnic: fix: NULL pointer dereference. docs: networking: packet_mmap: fix old config reference docs: networking: packet_mmap: fix formatting for C macros vhost_net: fix ubuf refcount incorrectly when sendmsg fails bareudp: Fix use of incorrect min_headroom size bareudp: set NETIF_F_LLTX flag net: hdlc_ppp: Fix issues when mod_timer is called while timer is running atlantic: remove architecture depends erspan: fix version 1 check in gre_parse_header() net: hns: fix return value check in __lb_other_process() net: sched: prevent invalid Scell_log shift count net: neighbor: fix a crash caused by mod zero ipv4: Ignore ECN bits for fib lookups in fib_compute_spec_dst() ...
Showing the changes to include/uapi/linux (2 of 92 files). Show all
Unified · Split
| @@ -293,6 +293,7 @@ enum nft_rule_compat_attributes { · 292 unmodified lines | ||
| 293 | 293 | * @NFT_SET_EVAL: set can be updated from the evaluation path |
| 294 | 294 | * @NFT_SET_OBJECT: set contains stateful objects |
| 295 | 295 | * @NFT_SET_CONCAT: set contains a concatenation |
| 296 | + * @NFT_SET_EXPR: set contains expressions | |
| 296 | 297 | */ |
| 297 | 298 | enum nft_set_flags { |
| 298 | 299 | NFT_SET_ANONYMOUS = 0x1, |
| @@ -303,6 +304,7 @@ enum nft_set_flags { · 4 unmodified lines | ||
| 303 | 304 | NFT_SET_EVAL = 0x20, |
| 304 | 305 | NFT_SET_OBJECT = 0x40, |
| 305 | 306 | NFT_SET_CONCAT = 0x80, |
| 307 | + NFT_SET_EXPR = 0x100, | |
| 306 | 308 | }; |
| 307 | 309 | |
| 308 | 310 | /** |
| @@ -706,6 +708,7 @@ enum nft_dynset_ops { · 397 unmodified lines | ||
| 706 | 708 | |
| 707 | 709 | enum nft_dynset_flags { |
| 708 | 710 | NFT_DYNSET_F_INV = (1 << 0), |
| 711 | + NFT_DYNSET_F_EXPR = (1 << 1), | |
| 709 | 712 | }; |
| 710 | 713 | |
| 711 | 714 | /** |
| @@ -116,7 +116,7 @@ struct pppol2tp_ioc_stats { · 115 unmodified lines | ||
| 116 | 116 | #define PPPIOCGCHAN _IOR('t', 55, int) /* get ppp channel number */ |
| 117 | 117 | #define PPPIOCGL2TPSTATS _IOR('t', 54, struct pppol2tp_ioc_stats) |
| 118 | 118 | #define PPPIOCBRIDGECHAN _IOW('t', 53, int) /* bridge one channel to another */ |
| 119 | −#define PPPIOCUNBRIDGECHAN _IO('t', 54) /* unbridge channel */ | |
| 119 | +#define PPPIOCUNBRIDGECHAN _IO('t', 52) /* unbridge channel */ | |
| 120 | 120 | |
| 121 | 121 | #define SIOCGPPPSTATS (SIOCDEVPRIVATE + 0) |
| 122 | 122 | #define SIOCGPPPVER (SIOCDEVPRIVATE + 1) /* NEVER change this!! */ |