Merge in late fixes in preparation for the net-next PR. Conflicts: include/net/sch_generic.h a6bd339dbb351 ("net_sched: fix skb memory leak in deferred qdisc drops") ff2998f29f390 ("net: sched: introduce qdisc-specific drop reason tracing") https://lore.kernel.org/adz0iX85FHMz0HdO@sirena.org.uk drivers/net/ethernet/airoha/airoha_eth.c 1acdfbdb516b ("net: airoha: Fix VIP configuration for AN7583 SoC") bf3471e6e6c0 ("net: airoha: Make flow control source port mapping dependent on nbq parameter") Adjacent changes: drivers/net/ethernet/airoha/airoha_ppe.c f44218cd5e6a ("net: airoha: Reset PPE cpu port configuration in airoha_ppe_hw_init()") 7da62262ec96 ("inet: add ip_local_port_step_width sysctl to improve port usage distribution")
Showing the changes to include/uapi/linux (1 of 60 files). Show all
Unified · Split
| @@ -82,7 +82,8 @@ · 81 unmodified lines | ||
| 82 | 82 | #define ADVERTISE_100BASE4 0x0200 /* Try for 100mbps 4k packets */ |
| 83 | 83 | #define ADVERTISE_PAUSE_CAP 0x0400 /* Try for pause */ |
| 84 | 84 | #define ADVERTISE_PAUSE_ASYM 0x0800 /* Try for asymetric pause */ |
| 85 | −#define ADVERTISE_RESV 0x1000 /* Unused... */ | |
| 85 | +#define ADVERTISE_XNP 0x1000 /* Extended Next Page */ | |
| 86 | +#define ADVERTISE_RESV ADVERTISE_XNP /* Used to be reserved */ | |
| 86 | 87 | #define ADVERTISE_RFAULT 0x2000 /* Say we can detect faults */ |
| 87 | 88 | #define ADVERTISE_LPACK 0x4000 /* Ack link partners response */ |
| 88 | 89 | #define ADVERTISE_NPAGE 0x8000 /* Next page bit */ |