uapi: update headers from 6.6-rc4

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index ec8dcbbaa7185ffc7aba8d2456fa7f8a39a34b79..f6f4347b75a5c9408406ac3f90611c71bff602ad 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1962,7 +1962,9 @@ union bpf_attr {
  *             performed again, if the helper is used in combination with
  *             direct packet access.
  *     Return
- *             0 on success, or a negative error in case of failure.
+ *             0 on success, or a negative error in case of failure. Positive
+ *             error indicates a potential drop or congestion in the target
+ *             device. The particular positive error codes are not defined.
  *
  * u64 bpf_get_current_pid_tgid(void)
  *     Description

diff --git a/include/uapi/linux/stddef.h b/include/uapi/linux/stddef.h
index 9bb07083ac89e7ea6d51903e19804cd403435978..b3d4a9c170ef1e765243e356c787a7effea47bdf 100644 (file)
--- a/include/uapi/linux/stddef.h
+++ b/include/uapi/linux/stddef.h
@@ -29,6 +29,11 @@
                struct TAG { MEMBERS } ATTRS NAME; \
        }
 
+#ifdef __cplusplus
+/* sizeof(struct{}) is 1 in C++, not 0, can't use C version of the macro. */
+#define __DECLARE_FLEX_ARRAY(T, member)        \
+       T member[0]
+#else
 /**
  * __DECLARE_FLEX_ARRAY() - Declare a flexible array usable in a union
  *
@@ -49,3 +54,5 @@
 #ifndef __counted_by
 #define __counted_by(m)
 #endif
+
+#endif /* _LINUX_STDDEF_H */