Cross-merge networking fixes after downstream PR. No conflicts.
Showing the changes to include/uapi (2 of 257 files). Show all
Unified · Split
| @@ -116,5 +116,8 @@ · 115 unmodified lines | |||
| 116 | #define AT_HANDLE_FID AT_REMOVEDIR /* file handle is needed to | 116 | #define AT_HANDLE_FID AT_REMOVEDIR /* file handle is needed to |
| 117 | compare object identity and may not | 117 | compare object identity and may not |
| 118 | be usable to open_by_handle_at(2) */ | 118 | be usable to open_by_handle_at(2) */ |
| 119 | #if defined(__KERNEL__) | ||
| 120 | #define AT_GETATTR_NOSEC 0x80000000 | ||
| 121 | #endif | ||
| 119 | 122 | ||
| 120 | #endif /* _UAPI_LINUX_FCNTL_H */ | 123 | #endif /* _UAPI_LINUX_FCNTL_H */ |
| @@ -239,7 +239,7 @@ struct v4l2_subdev_routing { · 238 unmodified lines | |||
| 239 | * set (which is the default), the 'stream' fields will be forced to 0 by the | 239 | * set (which is the default), the 'stream' fields will be forced to 0 by the |
| 240 | * kernel. | 240 | * kernel. |
| 241 | */ | 241 | */ |
| 242 | #define V4L2_SUBDEV_CLIENT_CAP_STREAMS (1U << 0) | 242 | #define V4L2_SUBDEV_CLIENT_CAP_STREAMS (1ULL << 0) |
| 243 | 243 | ||
| 244 | /** | 244 | /** |
| 245 | * struct v4l2_subdev_client_capability - Capabilities of the client accessing | 245 | * struct v4l2_subdev_client_capability - Capabilities of the client accessing |