Cross-merge networking fixes after downstream PR (net-6.13-rc6). No conflicts. Adjacent changes: include/linux/if_vlan.h f91a5b808938 ("af_packet: fix vlan_get_protocol_dgram() vs MSG_PEEK") 3f330db30638 ("net: reformat kdoc return statements")
Showing the changes to include/uapi (3 of 342 files). Show all
Unified · Split
| @@ -12,31 +12,33 @@ · 11 unmodified lines | |||
| 12 | /** | 12 | /** |
| 13 | * enum mptcp_event_type | 13 | * enum mptcp_event_type |
| 14 | * @MPTCP_EVENT_UNSPEC: unused event | 14 | * @MPTCP_EVENT_UNSPEC: unused event |
| 15 | * @MPTCP_EVENT_CREATED: token, family, saddr4 | saddr6, daddr4 | daddr6, | 15 | * @MPTCP_EVENT_CREATED: A new MPTCP connection has been created. It is the |
| 16 | * sport, dport A new MPTCP connection has been created. It is the good time | 16 | * good time to allocate memory and send ADD_ADDR if needed. Depending on the |
| 17 | * to allocate memory and send ADD_ADDR if needed. Depending on the | ||
| 18 | * 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 |
| 19 | * is sent. | 18 | * is sent. Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, |
| 20 | * @MPTCP_EVENT_ESTABLISHED: token, family, saddr4 | saddr6, daddr4 | daddr6, | 19 | * sport, dport, server-side. |
| 21 | * sport, dport A MPTCP connection is established (can start new subflows). | 20 | * @MPTCP_EVENT_ESTABLISHED: A MPTCP connection is established (can start new |
| 22 | * @MPTCP_EVENT_CLOSED: token A MPTCP connection has stopped. | 21 | * subflows). Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, |
| 23 | * @MPTCP_EVENT_ANNOUNCED: token, rem_id, family, daddr4 | daddr6 [, dport] A | 22 | * sport, dport, server-side. |
| 24 | * new address has been announced by the peer. | 23 | * @MPTCP_EVENT_CLOSED: A MPTCP connection has stopped. Attribute: token. |
| 25 | * @MPTCP_EVENT_REMOVED: token, rem_id An address has been lost by the peer. | 24 | * @MPTCP_EVENT_ANNOUNCED: A new address has been announced by the peer. |
| 26 | * @MPTCP_EVENT_SUB_ESTABLISHED: token, family, loc_id, rem_id, saddr4 | | 25 | * Attributes: token, rem_id, family, daddr4 | daddr6 [, dport]. |
| 27 | * saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error] A new | 26 | * @MPTCP_EVENT_REMOVED: An address has been lost by the peer. Attributes: |
| 28 | * subflow has been established. 'error' should not be set. | 27 | * token, rem_id. |
| 29 | * @MPTCP_EVENT_SUB_CLOSED: token, family, loc_id, rem_id, saddr4 | saddr6, | 28 | * @MPTCP_EVENT_SUB_ESTABLISHED: A new subflow has been established. 'error' |
| 30 | * daddr4 | daddr6, sport, dport, backup, if_idx [, error] A subflow has been | 29 | * should not be set. Attributes: token, family, loc_id, rem_id, saddr4 | |
| 31 | * closed. An error (copy of sk_err) could be set if an error has been | 30 | * saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error]. |
| 32 | * detected for this subflow. | 31 | * @MPTCP_EVENT_SUB_CLOSED: A subflow has been closed. An error (copy of |
| 33 | * @MPTCP_EVENT_SUB_PRIORITY: token, family, loc_id, rem_id, saddr4 | saddr6, | 32 | * sk_err) could be set if an error has been detected for this subflow. |
| 34 | * daddr4 | daddr6, sport, dport, backup, if_idx [, error] The priority of a | 33 | * Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 | |
| 35 | * subflow has changed. 'error' should not be set. | 34 | * daddr6, sport, dport, backup, if_idx [, error]. |
| 36 | * @MPTCP_EVENT_LISTENER_CREATED: family, sport, saddr4 | saddr6 A new PM | 35 | * @MPTCP_EVENT_SUB_PRIORITY: The priority of a subflow has changed. 'error' |
| 37 | * listener is created. | 36 | * should not be set. Attributes: token, family, loc_id, rem_id, saddr4 | |
| 38 | * @MPTCP_EVENT_LISTENER_CLOSED: family, sport, saddr4 | saddr6 A PM listener | 37 | * saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error]. |
| 39 | * is closed. | 38 | * @MPTCP_EVENT_LISTENER_CREATED: A new PM listener is created. Attributes: |
| 39 | * family, sport, saddr4 | saddr6. | ||
| 40 | * @MPTCP_EVENT_LISTENER_CLOSED: A PM listener is closed. Attributes: family, | ||
| 41 | * sport, saddr4 | saddr6. | ||
| 40 | */ | 42 | */ |
| 41 | enum mptcp_event_type { | 43 | enum mptcp_event_type { |
| 42 | MPTCP_EVENT_UNSPEC, | 44 | MPTCP_EVENT_UNSPEC, |
| @@ -8,6 +8,13 @@ · 7 unmodified lines | |||
| 8 | #define __always_inline inline | 8 | #define __always_inline inline |
| 9 | #endif | 9 | #endif |
| 10 | 10 | ||
| 11 | /* Not all C++ standards support type declarations inside an anonymous union */ | ||
| 12 | #ifndef __cplusplus | ||
| 13 | #define __struct_group_tag(TAG) TAG | ||
| 14 | #else | ||
| 15 | #define __struct_group_tag(TAG) | ||
| 16 | #endif | ||
| 17 | |||
| 11 | /** | 18 | /** |
| 12 | * __struct_group() - Create a mirrored named and anonyomous struct | 19 | * __struct_group() - Create a mirrored named and anonyomous struct |
| 13 | * | 20 | * |
| @@ -20,13 +27,13 @@ · 6 unmodified lines | |||
| 20 | * and size: one anonymous and one named. The former's members can be used | 27 | * and size: one anonymous and one named. The former's members can be used |
| 21 | * normally without sub-struct naming, and the latter can be used to | 28 | * normally without sub-struct naming, and the latter can be used to |
| 22 | * reason about the start, end, and size of the group of struct members. | 29 | * reason about the start, end, and size of the group of struct members. |
| 23 | * The named struct can also be explicitly tagged for layer reuse, as well | 30 | * The named struct can also be explicitly tagged for layer reuse (C only), |
| 24 | * as both having struct attributes appended. | 31 | * as well as both having struct attributes appended. |
| 25 | */ | 32 | */ |
| 26 | #define __struct_group(TAG, NAME, ATTRS, MEMBERS...) \ | 33 | #define __struct_group(TAG, NAME, ATTRS, MEMBERS...) \ |
| 27 | union { \ | 34 | union { \ |
| 28 | struct { MEMBERS } ATTRS; \ | 35 | struct { MEMBERS } ATTRS; \ |
| 29 | struct TAG { MEMBERS } ATTRS NAME; \ | 36 | struct __struct_group_tag(TAG) { MEMBERS } ATTRS NAME; \ |
| 30 | } ATTRS | 37 | } ATTRS |
| 31 | 38 | ||
| 32 | #ifdef __cplusplus | 39 | #ifdef __cplusplus |
| @@ -3,8 +3,8 @@ · 2 unmodified lines | |||
| 3 | #define _UAPI_LINUX_THERMAL_H | 3 | #define _UAPI_LINUX_THERMAL_H |
| 4 | 4 | ||
| 5 | #define THERMAL_NAME_LENGTH 20 | 5 | #define THERMAL_NAME_LENGTH 20 |
| 6 | #define THERMAL_THRESHOLD_WAY_UP BIT(0) | 6 | #define THERMAL_THRESHOLD_WAY_UP 0x1 |
| 7 | #define THERMAL_THRESHOLD_WAY_DOWN BIT(1) | 7 | #define THERMAL_THRESHOLD_WAY_DOWN 0x2 |
| 8 | 8 | ||
| 9 | enum thermal_device_mode { | 9 | enum thermal_device_mode { |
| 10 | THERMAL_DEVICE_DISABLED = 0, | 10 | THERMAL_DEVICE_DISABLED = 0, |