Update to v6.12 kernel headers.
Kernel headers coming from:
Git: https://android.googlesource.com/kernel/common/
Branch: android-mainline
Tag: android-mainline-6.12
Comment out the TAG usage of the __struct_group macro in linux/pkt_cls.h.
The kernel upstream is either going to revert this usage of __struct_group
or fix this in another way. When set, it creates a named struct in an
anonyous union, which is not allowed in C++.
Test: Builds and bionic unit tests pass on raven.
Change-Id: Ibb49550dfdc86fa0fc888b51d893959b6d433c59
diff --git a/libc/kernel/uapi/linux/pkt_cls.h b/libc/kernel/uapi/linux/pkt_cls.h
index bdca553..c5d8d79 100644
--- a/libc/kernel/uapi/linux/pkt_cls.h
+++ b/libc/kernel/uapi/linux/pkt_cls.h
@@ -179,7 +179,12 @@
int offmask;
};
struct tc_u32_sel {
- unsigned char flags;
+ /**
+ ** ANDROID FIX: Comment out TAG value to avoid C++ error about using
+ ** a type declared in an anonymous union. This is being fixed upstream
+ ** and should be corrected by the next kernel import.
+ */
+ __struct_group(/*tc_u32_sel_hdr*/, hdr,, unsigned char flags;
unsigned char offshift;
unsigned char nkeys;
__be16 offmask;
@@ -187,6 +192,7 @@
short offoff;
short hoff;
__be32 hmask;
+ );
struct tc_u32_key keys[];
};
struct tc_u32_mark {