From 579f27020c59c426a8fef8b970da9907f59809f8 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Tue, 12 Mar 2019 11:17:20 +0000
Subject: [PATCH] bpf: exclude bit fields from the check

Currently we have no instruments to check the size and offsets
of bit fields.

* gen_bpf_attr_check.sh: Do not print bit fields.
* m4/gen_bpf_attr_m4.awk: Likewise.
---
 gen_bpf_attr_check.sh  | 2 +-
 m4/gen_bpf_attr_m4.awk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gen_bpf_attr_check.sh b/gen_bpf_attr_check.sh
index 686027e9..f3b440ea 100755
--- a/gen_bpf_attr_check.sh
+++ b/gen_bpf_attr_check.sh
@@ -32,7 +32,7 @@ for struct in $(sed -n 's/^struct \([^[:space:]]\+_struct\) .*/\1/p' < "$input")
 	enum="$enum${enum:+.}"
 	ENUM="$ENUM${ENUM:+_}"
 	sed -n '/^struct '"$struct"' [^{]*{/,/^};$/p' < "$input" |
-	sed -n 's/^[[:space:]]\+[^][;]*[[:space:]]\([^][[:space:];]\+\)\(\[[^;]*\]\)\?;$/\1/p' |
+	sed -n 's/^[[:space:]]\+[^][;:]*[[:space:]]\([^][[:space:];:]\+\)\(\[[^;:]*\]\)\?;$/\1/p' |
 	while read field; do
 		FIELD="$(printf %s "$field" |tr '[:lower:]' '[:upper:]')"
 		cat <<EOF
diff --git a/m4/gen_bpf_attr_m4.awk b/m4/gen_bpf_attr_m4.awk
index 3158f7e5..320bb04c 100644
--- a/m4/gen_bpf_attr_m4.awk
+++ b/m4/gen_bpf_attr_m4.awk
@@ -29,7 +29,7 @@
 }
 
 (in_struct == 1) {
-	if (match($0, /^[[:space:]]+[^;\[\]]+[[:space:]]+([^[:space:]\[\];]+)(\[[^;]*\])?;$/, a)) {
+	if (match($0, /^[[:space:]]+[^;:\[\]]+[[:space:]]+([^[:space:]\[\];:]+)(\[[^;:]*\])?;$/, a)) {
 		print "\t\t" prefix "." a[1] ","
 	}
 }
-- 
2.50.1