Commit 2faf12c5 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman

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: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20210204162731.3132069-1-arnd@kernel.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f1bfe098
...@@ -111,7 +111,7 @@ struct vnt_rts_g { ...@@ -111,7 +111,7 @@ struct vnt_rts_g {
__le16 duration_bb; __le16 duration_bb;
u16 reserved; u16 reserved;
struct ieee80211_rts data; struct ieee80211_rts data;
} __packed; } __packed __aligned(2);
struct vnt_rts_g_fb { struct vnt_rts_g_fb {
struct vnt_phy_field b; struct vnt_phy_field b;
...@@ -125,14 +125,14 @@ struct vnt_rts_g_fb { ...@@ -125,14 +125,14 @@ struct vnt_rts_g_fb {
__le16 rts_duration_ba_f1; __le16 rts_duration_ba_f1;
__le16 rts_duration_aa_f1; __le16 rts_duration_aa_f1;
struct ieee80211_rts data; struct ieee80211_rts data;
} __packed; } __packed __aligned(2);
struct vnt_rts_ab { struct vnt_rts_ab {
struct vnt_phy_field ab; struct vnt_phy_field ab;
__le16 duration; __le16 duration;
u16 reserved; u16 reserved;
struct ieee80211_rts data; struct ieee80211_rts data;
} __packed; } __packed __aligned(2);
struct vnt_rts_a_fb { struct vnt_rts_a_fb {
struct vnt_phy_field a; struct vnt_phy_field a;
...@@ -141,7 +141,7 @@ struct vnt_rts_a_fb { ...@@ -141,7 +141,7 @@ struct vnt_rts_a_fb {
__le16 rts_duration_f0; __le16 rts_duration_f0;
__le16 rts_duration_f1; __le16 rts_duration_f1;
struct ieee80211_rts data; struct ieee80211_rts data;
} __packed; } __packed __aligned(2);
/* CTS buffer header */ /* CTS buffer header */
struct vnt_cts { struct vnt_cts {
......
...@@ -95,7 +95,7 @@ struct vnt_rts_g { ...@@ -95,7 +95,7 @@ struct vnt_rts_g {
u16 wReserved; u16 wReserved;
struct ieee80211_rts data; struct ieee80211_rts data;
struct vnt_tx_datahead_g data_head; struct vnt_tx_datahead_g data_head;
} __packed; } __packed __aligned(2);
struct vnt_rts_ab { struct vnt_rts_ab {
struct vnt_phy_field ab; struct vnt_phy_field ab;
...@@ -103,7 +103,7 @@ struct vnt_rts_ab { ...@@ -103,7 +103,7 @@ struct vnt_rts_ab {
u16 wReserved; u16 wReserved;
struct ieee80211_rts data; struct ieee80211_rts data;
struct vnt_tx_datahead_ab data_head; struct vnt_tx_datahead_ab data_head;
} __packed; } __packed __aligned(2);
/* CTS buffer header */ /* CTS buffer header */
struct vnt_cts { struct vnt_cts {
...@@ -113,7 +113,7 @@ struct vnt_cts { ...@@ -113,7 +113,7 @@ struct vnt_cts {
struct ieee80211_cts data; struct ieee80211_cts data;
u16 reserved2; u16 reserved2;
struct vnt_tx_datahead_g data_head; struct vnt_tx_datahead_g data_head;
} __packed; } __packed __aligned(2);
union vnt_tx_data_head { union vnt_tx_data_head {
/* rts g */ /* rts g */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment