Cross-merge networking fixes after downstream PR. No conflicts. Adjacent changes: drivers/net/ethernet/sfc/tc.c 622ab656344a ("sfc: fix error unwinds in TC offload") b6583d5e9e94 ("sfc: support TC decap rules matching on enc_src_port") net/mptcp/protocol.c 5b825727d087 ("mptcp: add annotations around msk->subflow accesses") e76c8ef5cc5b ("mptcp: refactor mptcp_stream_accept()")
Showing the changes to tools/include/uapi/linux (1 of 429 files). Show all
Unified · Split
| @@ -163,6 +163,7 @@ struct in_addr { · 162 unmodified lines | |||
| 163 | #define IP_MULTICAST_ALL 49 | 163 | #define IP_MULTICAST_ALL 49 |
| 164 | #define IP_UNICAST_IF 50 | 164 | #define IP_UNICAST_IF 50 |
| 165 | #define IP_LOCAL_PORT_RANGE 51 | 165 | #define IP_LOCAL_PORT_RANGE 51 |
| 166 | #define IP_PROTOCOL 52 | ||
| 166 | 167 | ||
| 167 | #define MCAST_EXCLUDE 0 | 168 | #define MCAST_EXCLUDE 0 |
| 168 | #define MCAST_INCLUDE 1 | 169 | #define MCAST_INCLUDE 1 |