summaryrefslogtreecommitdiff
path: root/drivers/staging/vt6655
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-22 08:55:27 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-22 08:55:27 +0100
commitc7f57fd6b7f0a889b0f847611c9075c37dd31810 (patch)
treed820b364e81dd1698c530ae5463f1d27f697c884 /drivers/staging/vt6655
parent21ae24cce84f3384a00f9ba4df26eab19bee666c (diff)
parent0d02ec6b3136c73c09e7859f0d0e4e2c4c07b49b (diff)
Merge v5.12-rc4 into staging-next
We want the staging/iio fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655')
-rw-r--r--drivers/staging/vt6655/rxtx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/vt6655/rxtx.h b/drivers/staging/vt6655/rxtx.h
index e7061d383306..c3c2c1566882 100644
--- a/drivers/staging/vt6655/rxtx.h
+++ b/drivers/staging/vt6655/rxtx.h
@@ -150,7 +150,7 @@ struct vnt_cts {
u16 reserved;
struct ieee80211_cts data;
u16 reserved2;
-} __packed;
+} __packed __aligned(2);
struct vnt_cts_fb {
struct vnt_phy_field b;
@@ -160,7 +160,7 @@ struct vnt_cts_fb {
__le16 cts_duration_ba_f1;
struct ieee80211_cts data;
u16 reserved2;
-} __packed;
+} __packed __aligned(2);
struct vnt_tx_fifo_head {
u8 tx_key[WLAN_KEY_LEN_CCMP];