Cross-merge networking fixes after downstream PR (net-6.17-rc4). No conflicts. Adjacent changes: drivers/net/ethernet/intel/idpf/idpf_txrx.c 02614eee26fb ("idpf: do not linearize big TSO packets") 6c4e68480238 ("idpf: remove obsolete stashing code")
Showing the changes to include/uapi (3 of 393 files). Show all
Unified · Split
| @@ -89,6 +89,7 @@ struct pfru_payload_hdr { · 88 unmodified lines | ||
| 89 | 89 | __u32 hw_ver; |
| 90 | 90 | __u32 rt_ver; |
| 91 | 91 | __u8 platform_id[16]; |
| 92 | + __u32 svn_ver; | |
| 92 | 93 | }; |
| 93 | 94 | |
| 94 | 95 | enum pfru_dsm_status { |
| @@ -173,7 +173,7 @@ typedef struct mdp_superblock_s { · 172 unmodified lines | ||
| 173 | 173 | #else |
| 174 | 174 | #error unspecified endianness |
| 175 | 175 | #endif |
| 176 | − __u32 resync_offset; /* 11 resync checkpoint sector count */ | |
| 176 | + __u32 recovery_cp; /* 11 resync checkpoint sector count */ | |
| 177 | 177 | /* There are only valid for minor_version > 90 */ |
| 178 | 178 | __u64 reshape_position; /* 12,13 next address in array-space for reshape */ |
| 179 | 179 | __u32 new_level; /* 14 new level we are reshaping to */ |
| @@ -260,7 +260,7 @@ · 259 unmodified lines | ||
| 260 | 260 | * When fork_owner is set to VHOST_FORK_OWNER_KTHREAD: |
| 261 | 261 | * - Vhost will create vhost workers as kernel threads. |
| 262 | 262 | */ |
| 263 | −#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x83, __u8) | |
| 263 | +#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x84, __u8) | |
| 264 | 264 | |
| 265 | 265 | /** |
| 266 | 266 | * VHOST_GET_FORK_OWNER - Get the current fork_owner flag for the vhost device. |
| @@ -268,6 +268,6 @@ · 1 unmodified line | ||
| 268 | 268 | * |
| 269 | 269 | * @return: An 8-bit value indicating the current thread mode. |
| 270 | 270 | */ |
| 271 | −#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x84, __u8) | |
| 271 | +#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x85, __u8) | |
| 272 | 272 | |
| 273 | 273 | #endif |