Pull networking fixes from Jakub Kicinski: "Including fixes from xfrm, bpf, netfilter, and wireless. Current release - regressions: - xfrm: fix XFRM_MSG_MAPPING ABI breakage caused by inserting a new value in the middle of an enum - unix: fix an issue in unix_shutdown causing the other end read/write failures - phy: mdio: fix memory leak Current release - new code bugs: - mlx5e: improve MQPRIO resiliency against bad configs Previous releases - regressions: - bpf: fix integer overflow leading to OOB access in map element pre-allocation - stmmac: dwmac-rk: fix ethernet on rk3399 based devices - netfilter: conntrack: fix boot failure with nf_conntrack.enable_hooks=1 - brcmfmac: revert using ISO3166 country code and 0 rev as fallback - i40e: fix freeing of uninitialized misc IRQ vector - iavf: fix double unlock of crit_lock Previous releases - always broken: - bpf, arm: fix register clobbering in div/mod implementation - netfilter: nf_tables: correct issues in netlink rule change event notifications - dsa: tag_dsa: fix mask for trunked packets - usb: r8152: don't resubmit rx immediately to avoid soft lockup on device unplug - i40e: fix endless loop under rtnl if FW fails to correctly respond to capability query - mlx5e: fix rx checksum offload coexistence with ipsec offload - mlx5: force round second at 1PPS out start time and allow it only in supported clock modes - phy: pcs: xpcs: fix incorrect CL37 AN sequence, EEE disable sequence Misc: - xfrm: slightly rejig the new policy uAPI to make it less cryptic" * tag 'net-5.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (66 commits) net: prefer socket bound to interface when not in VRF iavf: fix double unlock of crit_lock i40e: Fix freeing of uninitialized misc IRQ vector i40e: fix endless loop under rtnl dt-bindings: net: dsa: marvell: fix compatible in example ionic: move filter sync_needed bit set gve: report 64bit tx_bytes counter from gve_handle_report_stats() gve: fix gve_get_stats() rtnetlink: fix if_nlmsg_stats_size() under estimation gve: Properly handle errors in gve_assign_qpl gve: Avoid freeing NULL pointer gve: Correct available tx qpl check unix: Fix an issue in unix_shutdown causing the other end read/write failures net: stmmac: trigger PCS EEE to turn off on link down net: pcs: xpcs: fix incorrect steps on disable EEE netlink: annotate data races around nlk->bound net: pcs: xpcs: fix incorrect CL37 AN sequence net: sfp: Fix typo in state machine debug string net/sched: sch_taprio: properly cancel timer from taprio_destroy() net: bridge: fix under estimation in br_get_linkxstats_size() ...
Showing the changes to include/uapi (1 of 73 files). Show all
Unified · Split
| @@ -213,13 +213,13 @@ enum { · 212 unmodified lines | ||
| 213 | 213 | XFRM_MSG_GETSPDINFO, |
| 214 | 214 | #define XFRM_MSG_GETSPDINFO XFRM_MSG_GETSPDINFO |
| 215 | 215 | |
| 216 | + XFRM_MSG_MAPPING, | |
| 217 | +#define XFRM_MSG_MAPPING XFRM_MSG_MAPPING | |
| 218 | + | |
| 216 | 219 | XFRM_MSG_SETDEFAULT, |
| 217 | 220 | #define XFRM_MSG_SETDEFAULT XFRM_MSG_SETDEFAULT |
| 218 | 221 | XFRM_MSG_GETDEFAULT, |
| 219 | 222 | #define XFRM_MSG_GETDEFAULT XFRM_MSG_GETDEFAULT |
| 220 | − | |
| 221 | − XFRM_MSG_MAPPING, | |
| 222 | −#define XFRM_MSG_MAPPING XFRM_MSG_MAPPING | |
| 223 | 223 | __XFRM_MSG_MAX |
| 224 | 224 | }; |
| 225 | 225 | #define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1) |
| @@ -514,9 +514,12 @@ struct xfrm_user_offload { · 288 unmodified lines | ||
| 514 | 514 | #define XFRM_OFFLOAD_INBOUND 2 |
| 515 | 515 | |
| 516 | 516 | struct xfrm_userpolicy_default { |
| 517 | −#define XFRM_USERPOLICY_DIRMASK_MAX (sizeof(__u8) * 8) | |
| 518 | − __u8 dirmask; | |
| 519 | − __u8 action; | |
| 517 | +#define XFRM_USERPOLICY_UNSPEC 0 | |
| 518 | +#define XFRM_USERPOLICY_BLOCK 1 | |
| 519 | +#define XFRM_USERPOLICY_ACCEPT 2 | |
| 520 | + __u8 in; | |
| 521 | + __u8 fwd; | |
| 522 | + __u8 out; | |
| 520 | 523 | }; |
| 521 | 524 | |
| 522 | 525 | #ifndef __KERNEL__ |