Pull networking fixes from Paolo Abeni: "Including fixes from bluetooth and wireless. Current release - regressions: - bridge: fix use-after-free during router port configuration Current release - new code bugs: - eth: wangxun: fix the creation of page_pool Previous releases - regressions: - netpoll: initialize UDP checksum field before checksumming - wifi: mac80211: finish link init before RCU publish - bluetooth: fix use-after-free in vhci_flush() - eth: - ionic: fix DMA mapping test - bnxt: properly flush XDP redirect lists Previous releases - always broken: - netlink: specs: enforce strict naming of properties - unix: don't leave consecutive consumed OOB skbs. - vsock: fix linux/vm_sockets.h userspace compilation errors - selftests: fix TCP packet checksum" * tag 'net-6.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (38 commits) net: libwx: fix the creation of page_pool net: selftests: fix TCP packet checksum atm: Release atm_dev_mutex after removing procfs in atm_dev_deregister(). netlink: specs: enforce strict naming of properties netlink: specs: tc: replace underscores with dashes in names netlink: specs: rt-link: replace underscores with dashes in names netlink: specs: mptcp: replace underscores with dashes in names netlink: specs: ovs_flow: replace underscores with dashes in names netlink: specs: devlink: replace underscores with dashes in names netlink: specs: dpll: replace underscores with dashes in names netlink: specs: ethtool: replace underscores with dashes in names netlink: specs: fou: replace underscores with dashes in names netlink: specs: nfsd: replace underscores with dashes in names net: enetc: Correct endianness handling in _enetc_rd_reg64 atm: idt77252: Add missing `dma_map_error()` bnxt: properly flush XDP redirect lists vsock/uapi: fix linux/vm_sockets.h userspace compilation errors wifi: mac80211: finish link init before RCU publish wifi: iwlwifi: mvm: assume '1' as the default mac_config_cmd version selftest: af_unix: Add tests for -ECONNRESET. ...
Showing the changes to include/uapi/linux (2 of 41 files). Show all
Unified · Split
| @@ -27,14 +27,14 @@ · 26 unmodified lines | ||
| 27 | 27 | * token, rem_id. |
| 28 | 28 | * @MPTCP_EVENT_SUB_ESTABLISHED: A new subflow has been established. 'error' |
| 29 | 29 | * should not be set. Attributes: token, family, loc_id, rem_id, saddr4 | |
| 30 | − * saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error]. | |
| 30 | + * saddr6, daddr4 | daddr6, sport, dport, backup, if-idx [, error]. | |
| 31 | 31 | * @MPTCP_EVENT_SUB_CLOSED: A subflow has been closed. An error (copy of |
| 32 | 32 | * sk_err) could be set if an error has been detected for this subflow. |
| 33 | 33 | * Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 | |
| 34 | − * daddr6, sport, dport, backup, if_idx [, error]. | |
| 34 | + * daddr6, sport, dport, backup, if-idx [, error]. | |
| 35 | 35 | * @MPTCP_EVENT_SUB_PRIORITY: The priority of a subflow has changed. 'error' |
| 36 | 36 | * should not be set. Attributes: token, family, loc_id, rem_id, saddr4 | |
| 37 | − * saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error]. | |
| 37 | + * saddr6, daddr4 | daddr6, sport, dport, backup, if-idx [, error]. | |
| 38 | 38 | * @MPTCP_EVENT_LISTENER_CREATED: A new PM listener is created. Attributes: |
| 39 | 39 | * family, sport, saddr4 | saddr6. |
| 40 | 40 | * @MPTCP_EVENT_LISTENER_CLOSED: A PM listener is closed. Attributes: family, |
| @@ -17,6 +17,10 @@ · 16 unmodified lines | ||
| 17 | 17 | #ifndef _UAPI_VM_SOCKETS_H |
| 18 | 18 | #define _UAPI_VM_SOCKETS_H |
| 19 | 19 | |
| 20 | +#ifndef __KERNEL__ | |
| 21 | +#include <sys/socket.h> /* for struct sockaddr and sa_family_t */ | |
| 22 | +#endif | |
| 23 | + | |
| 20 | 24 | #include <linux/socket.h> |
| 21 | 25 | #include <linux/types.h> |
| 22 | 26 | |