Commit 2faf12c5 authored Feb 04, 2021 by Arnd Bergmann Committed by Greg Kroah-Hartman Feb 06, 2021

staging: vt665x: fix alignment constraints

multiple structures contains a ieee80211_rts structure, which is required to
have at least two byte alignment, but are annotated with a __packed attribute
to force single-byte alignment:

staging/vt6656/rxtx.h:98:1: warning: alignment 1 of 'struct vnt_rts_g' is less than 2 [-Wpacked-not-aligned]
staging/vt6656/rxtx.h:106:1: warning: alignment 1 of 'struct vnt_rts_ab' is less than 2 [-Wpacked-not-aligned]
staging/vt6656/rxtx.h:116:1: warning: alignment 1 of 'struct vnt_cts' is less than 2 [-Wpacked-not-aligned]

I see no reason why the structure itself would be misaligned, and all members
have at least two-byte alignment within the structure, so use the same
constraint on the sturcture itself.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20210204162731.3132069-1-arnd@kernel.org

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent f1bfe098

drivers/staging/vt6655/rxtx.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ struct vnt_rts_g {
		__le16 duration_bb;
		u16 reserved;
		struct ieee80211_rts data;
		} __packed;
		} __packed __aligned(2);

		struct vnt_rts_g_fb {
		struct vnt_phy_field b;
		@@ -125,14 +125,14 @@ struct vnt_rts_g_fb {
		__le16 rts_duration_ba_f1;
		__le16 rts_duration_aa_f1;
		struct ieee80211_rts data;
		} __packed;
		} __packed __aligned(2);

		struct vnt_rts_ab {
		struct vnt_phy_field ab;
		__le16 duration;
		u16 reserved;
		struct ieee80211_rts data;
		} __packed;
		} __packed __aligned(2);

		struct vnt_rts_a_fb {
		struct vnt_phy_field a;
		@@ -141,7 +141,7 @@ struct vnt_rts_a_fb {
		__le16 rts_duration_f0;
		__le16 rts_duration_f1;
		struct ieee80211_rts data;
		} __packed;
		} __packed __aligned(2);

		/* CTS buffer header */
		struct vnt_cts {

drivers/staging/vt6656/rxtx.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ struct vnt_rts_g {
		u16 wReserved;
		struct ieee80211_rts data;
		struct vnt_tx_datahead_g data_head;
		} __packed;
		} __packed __aligned(2);

		struct vnt_rts_ab {
		struct vnt_phy_field ab;
		@@ -103,7 +103,7 @@ struct vnt_rts_ab {
		u16 wReserved;
		struct ieee80211_rts data;
		struct vnt_tx_datahead_ab data_head;
		} __packed;
		} __packed __aligned(2);

		/* CTS buffer header */
		struct vnt_cts {
		@@ -113,7 +113,7 @@ struct vnt_cts {
		struct ieee80211_cts data;
		u16 reserved2;
		struct vnt_tx_datahead_g data_head;
		} __packed;
		} __packed __aligned(2);

		union vnt_tx_data_head {
		/* rts g */