Cross-merge networking fixes after downstream PR (net-6.17-rc7). No conflicts. Adjacent changes: drivers/net/ethernet/mellanox/mlx5/core/en/fs.h 9536fbe10c9d ("net/mlx5e: Add PSP steering in local NIC RX") 7601a0a46216 ("net/mlx5e: Add a miss level for ipsec crypto offload")
Showing the changes to include/uapi (2 of 229 files). Show all
Unified · Split
| @@ -31,6 +31,8 @@ · 30 unmodified lines | |||
| 31 | #define MPTCP_INFO_FLAG_FALLBACK _BITUL(0) | 31 | #define MPTCP_INFO_FLAG_FALLBACK _BITUL(0) |
| 32 | #define MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED _BITUL(1) | 32 | #define MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED _BITUL(1) |
| 33 | 33 | ||
| 34 | #define MPTCP_PM_EV_FLAG_DENY_JOIN_ID0 _BITUL(0) | ||
| 35 | |||
| 34 | #define MPTCP_PM_ADDR_FLAG_SIGNAL (1 << 0) | 36 | #define MPTCP_PM_ADDR_FLAG_SIGNAL (1 << 0) |
| 35 | #define MPTCP_PM_ADDR_FLAG_SUBFLOW (1 << 1) | 37 | #define MPTCP_PM_ADDR_FLAG_SUBFLOW (1 << 1) |
| 36 | #define MPTCP_PM_ADDR_FLAG_BACKUP (1 << 2) | 38 | #define MPTCP_PM_ADDR_FLAG_BACKUP (1 << 2) |
| @@ -16,10 +16,10 @@ · 15 unmodified lines | |||
| 16 | * good time to allocate memory and send ADD_ADDR if needed. Depending on the | 16 | * good time to allocate memory and send ADD_ADDR if needed. Depending on the |
| 17 | * traffic-patterns it can take a long time until the MPTCP_EVENT_ESTABLISHED | 17 | * traffic-patterns it can take a long time until the MPTCP_EVENT_ESTABLISHED |
| 18 | * is sent. Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, | 18 | * is sent. Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, |
| 19 | * sport, dport, server-side. | 19 | * sport, dport, server-side, [flags]. |
| 20 | * @MPTCP_EVENT_ESTABLISHED: A MPTCP connection is established (can start new | 20 | * @MPTCP_EVENT_ESTABLISHED: A MPTCP connection is established (can start new |
| 21 | * subflows). Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, | 21 | * subflows). Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, |
| 22 | * sport, dport, server-side. | 22 | * sport, dport, server-side, [flags]. |
| 23 | * @MPTCP_EVENT_CLOSED: A MPTCP connection has stopped. Attribute: token. | 23 | * @MPTCP_EVENT_CLOSED: A MPTCP connection has stopped. Attribute: token. |
| 24 | * @MPTCP_EVENT_ANNOUNCED: A new address has been announced by the peer. | 24 | * @MPTCP_EVENT_ANNOUNCED: A new address has been announced by the peer. |
| 25 | * Attributes: token, rem_id, family, daddr4 | daddr6 [, dport]. | 25 | * Attributes: token, rem_id, family, daddr4 | daddr6 [, dport]. |