linux-kernel - [PATCH 1/4] HEADERS, do not merge!!!!

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20191101112509.29723-1-ribalda@kernel.org>
Date:   Fri,  1 Nov 2019 12:25:06 +0100
From:   Ricardo Ribalda Delgado <ribalda@...nel.org>
To:     Hans Verkuil <hverkuil-cisco@...all.nl>,
        linux-media@...r.kernel.org, linux-kernel@...r.kernel.org
Cc:     Ricardo Ribalda Delgado <ribalda@...nel.org>
Subject: [PATCH 1/4] HEADERS, do not merge!!!!

---
 contrib/freebsd/include/linux/videodev2.h | 1 +
 include/linux/videodev2.h                 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h
index 85fa80f7..e90c8912 100644
--- a/contrib/freebsd/include/linux/videodev2.h
+++ b/contrib/freebsd/include/linux/videodev2.h
@@ -1713,6 +1713,7 @@ struct v4l2_ext_control {
 		uint16_t *p_u16;
 		uint32_t *p_u32;
 		void *ptr;
+		struct v4l2_area *p_area;
 	};
 } __attribute__ ((packed));
 
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 6d66a789..7bafe5cd 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -1678,6 +1678,7 @@ struct v4l2_ext_control {
 		__u8 *p_u8;
 		__u16 *p_u16;
 		__u32 *p_u32;
+		struct v4l2_area *p_area;
 		void *ptr;
 	};
 } __attribute__ ((packed));
-- 
2.24.0.rc1