From 97aaa0985b9f4d46ce79b21e20113931b6aed5ae Mon Sep 17 00:00:00 2001
From: Jason Self <j@jxself.org>
Date: Sun, 6 May 2018 07:43:47 -0700
Subject: [PATCH 1/1] carl9170: Update based on commit
 370b7919114a02149088c482c8709cafb9bf7478 dated May 2 2018

---
 WHENCE                            |  4 ++--
 carl9170fw/carlfw/include/dma.h   |  4 ++--
 carl9170fw/include/shared/fwcmd.h |  2 +-
 carl9170fw/include/shared/wlan.h  | 12 ++++++------
 carl9170fw/toolchain/Makefile     |  2 +-
 carl9170fw/toolchain/SHA256SUMS   |  1 +
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/WHENCE b/WHENCE
index e693871..ab77bb1 100644
--- a/WHENCE
+++ b/WHENCE
@@ -126,8 +126,8 @@ From https://git.kernel.org/pub/scm/utils/cis-tools/cis-tools.git
 
 Driver: carl9170 -- Atheros AR9170 802.11 draft-n USB driver
 
-Version: Based on commit cd76b7b483731dc5cb467c28cc70478179fbffd5 
-dated Feb 9 2018.
+Version: Based on commit 370b7919114a02149088c482c8709cafb9bf7478
+dated May 2 2018.
 
 Licence: GPLv2 or later.
 
diff --git a/carl9170fw/carlfw/include/dma.h b/carl9170fw/carlfw/include/dma.h
index 477c2a2..8141b1c 100644
--- a/carl9170fw/carlfw/include/dma.h
+++ b/carl9170fw/carlfw/include/dma.h
@@ -73,12 +73,12 @@ struct carl9170_tx_ba_superframe {
 struct ar9170_tx_null_frame {
 	struct ar9170_tx_hwdesc hdr;
 	struct ieee80211_hdr null;
-} __packed;
+} __packed __aligned(4);
 
 struct carl9170_tx_null_superframe {
 	struct carl9170_tx_superdesc s;
 	struct ar9170_tx_null_frame f;
-} __packed;
+} __packed __aligned(4);
 
 #define CARL9170_BA_BUFFER_LEN	(__roundup(sizeof(struct carl9170_tx_ba_superframe), 16))
 #define CARL9170_RSP_BUFFER_LEN	AR9170_BLOCK_SIZE
diff --git a/carl9170fw/include/shared/fwcmd.h b/carl9170fw/include/shared/fwcmd.h
index ea1d80f..2a58dd8 100644
--- a/carl9170fw/include/shared/fwcmd.h
+++ b/carl9170fw/include/shared/fwcmd.h
@@ -240,7 +240,7 @@ struct carl9170_cmd {
 		struct carl9170_bcn_ctrl_cmd	bcn_ctrl;
 		struct carl9170_rx_filter_cmd	rx_filter;
 		u8 data[CARL9170_MAX_CMD_PAYLOAD_LEN];
-	} __packed;
+	} __packed __aligned(4);
 } __packed __aligned(4);
 
 #define	CARL9170_TX_STATUS_QUEUE	3
diff --git a/carl9170fw/include/shared/wlan.h b/carl9170fw/include/shared/wlan.h
index ea17995..9c6b7ff 100644
--- a/carl9170fw/include/shared/wlan.h
+++ b/carl9170fw/include/shared/wlan.h
@@ -370,24 +370,24 @@ struct ar9170_rx_frame_single {
 	struct ieee80211_hdr i3e;
 	struct ar9170_rx_phystatus phy_tail;
 	struct ar9170_rx_macstatus macstatus;
-} __packed;
+} __packed __aligned(4);
 
 struct ar9170_rx_frame_head {
 	struct ar9170_rx_head phy_head;
 	struct ieee80211_hdr i3e;
 	struct ar9170_rx_macstatus macstatus;
-} __packed;
+} __packed __aligned(4);
 
 struct ar9170_rx_frame_middle {
 	struct ieee80211_hdr i3e;
 	struct ar9170_rx_macstatus macstatus;
-} __packed;
+} __packed __aligned(4);
 
 struct ar9170_rx_frame_tail {
 	struct ieee80211_hdr i3e;
 	struct ar9170_rx_phystatus phy_tail;
 	struct ar9170_rx_macstatus macstatus;
-} __packed;
+} __packed __aligned(4);
 
 struct ar9170_rx_frame {
 	union {
@@ -395,8 +395,8 @@ struct ar9170_rx_frame {
 		struct ar9170_rx_frame_head head;
 		struct ar9170_rx_frame_middle middle;
 		struct ar9170_rx_frame_tail tail;
-	} __packed;
-} __packed;
+	} __packed __aligned(4);
+} __packed __aligned(4);
 
 static inline u8 ar9170_get_decrypt_type(struct ar9170_rx_macstatus *t)
 {
diff --git a/carl9170fw/toolchain/Makefile b/carl9170fw/toolchain/Makefile
index 3ee93a9..1752f1f 100644
--- a/carl9170fw/toolchain/Makefile
+++ b/carl9170fw/toolchain/Makefile
@@ -6,7 +6,7 @@ NEWLIB_VER=3.0.0
 NEWLIB_TAR=newlib-$(NEWLIB_VER).tar.gz
 NEWLIB_URL="ftp://sourceware.org/pub/newlib/$(NEWLIB_TAR)"
 
-GCC_VER=7.3.0
+GCC_VER=8.1.0
 GCC_TAR=gcc-$(GCC_VER).tar.xz
 GCC_URL="http://ftpmirror.gnu.org/gnu/gcc/gcc-$(GCC_VER)/$(GCC_TAR)"
 
diff --git a/carl9170fw/toolchain/SHA256SUMS b/carl9170fw/toolchain/SHA256SUMS
index 99505e4..29cef88 100644
--- a/carl9170fw/toolchain/SHA256SUMS
+++ b/carl9170fw/toolchain/SHA256SUMS
@@ -11,4 +11,5 @@ c8566335ee74e5fcaeb8595b4ebd0400c4b043d6acb3263ecb1314f8f5501332  src/newlib-3.0
 e7010a46969f9d3e53b650a518663f98a5dde3c3ae21b7d71e5e6803bc36b577  src/binutils-2.29.1.tar.xz
 67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e  src/mpfr-4.0.1.tar.xz
 6e46b8aeae2f727a36f0bd9505e405768a72218f1796f0d09757d45209871ae6  src/binutils-2.30.tar.xz
+1d1866f992626e61349a1ccd0b8d5253816222cdc13390dcfaa74b093aa2b153  src/gcc-8.1.0.tar.xz
 
-- 
2.31.1