---- a/drivers/net/wireless/ath/ath9k/common.h
-+++ b/drivers/net/wireless/ath/ath9k/common.h
-@@ -27,7 +27,7 @@
- #define WME_MAX_BA WME_BA_BMP_SIZE
- #define ATH_TID_MAX_BUFS (2 * WME_MAX_BA)
-
--#define ATH_RSSI_DUMMY_MARKER 0x127
-+#define ATH_RSSI_DUMMY_MARKER 127
- #define ATH_RSSI_LPF_LEN 10
- #define RSSI_LPF_THRESHOLD -20
- #define ATH_RSSI_EP_MULTIPLIER (1<<7)
---- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
-+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
-@@ -1067,15 +1067,19 @@ static bool ath9k_rx_prepare(struct ath9
-
- last_rssi = priv->rx.last_rssi;
-
-- if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
-- rxbuf->rxstatus.rs_rssi = ATH_EP_RND(last_rssi,
-- ATH_RSSI_EP_MULTIPLIER);
-+ if (ieee80211_is_beacon(hdr->frame_control) &&
-+ !is_zero_ether_addr(common->curbssid) &&
-+ ether_addr_equal(hdr->addr3, common->curbssid)) {
-+ s8 rssi = rxbuf->rxstatus.rs_rssi;
-
-- if (rxbuf->rxstatus.rs_rssi < 0)
-- rxbuf->rxstatus.rs_rssi = 0;
-+ if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))
-+ rssi = ATH_EP_RND(last_rssi, ATH_RSSI_EP_MULTIPLIER);
-
-- if (ieee80211_is_beacon(fc))
-- priv->ah->stats.avgbrssi = rxbuf->rxstatus.rs_rssi;
-+ if (rssi < 0)
-+ rssi = 0;
-+
-+ priv->ah->stats.avgbrssi = rssi;
-+ }
-
- rx_status->mactime = be64_to_cpu(rxbuf->rxstatus.rs_tstamp);
- rx_status->band = hw->conf.channel->band;
---- a/include/linux/ieee80211.h
-+++ b/include/linux/ieee80211.h
-@@ -185,7 +185,7 @@ struct ieee80211_hdr {
- u8 addr3[6];
- __le16 seq_ctrl;
- u8 addr4[6];
--} __packed;
-+} __packed __aligned(2);
-
- struct ieee80211_hdr_3addr {
- __le16 frame_control;
-@@ -194,7 +194,7 @@ struct ieee80211_hdr_3addr {
- u8 addr2[6];
- u8 addr3[6];
- __le16 seq_ctrl;
--} __packed;
-+} __packed __aligned(2);
-
- struct ieee80211_qos_hdr {
- __le16 frame_control;
-@@ -204,7 +204,7 @@ struct ieee80211_qos_hdr {
- u8 addr3[6];
- __le16 seq_ctrl;
- __le16 qos_ctrl;
--} __packed;
-+} __packed __aligned(2);
-
- /**
- * ieee80211_has_tods - check if IEEE80211_FCTL_TODS is set
-@@ -581,7 +581,7 @@ struct ieee80211s_hdr {
- __le32 seqnum;
- u8 eaddr1[6];
- u8 eaddr2[6];
--} __packed;
-+} __packed __aligned(2);
-
- /* Mesh flags */
- #define MESH_FLAGS_AE_A4 0x1
-@@ -875,7 +875,7 @@ struct ieee80211_mgmt {
- } u;
- } __packed action;
- } u;
--} __packed;
-+} __packed __aligned(2);
-
- /* Supported Rates value encodings in 802.11n-2009 7.3.2.2 */
- #define BSS_MEMBERSHIP_SELECTOR_HT_PHY 127
-@@ -906,20 +906,20 @@ struct ieee80211_rts {
- __le16 duration;
- u8 ra[6];
- u8 ta[6];
--} __packed;
-+} __packed __aligned(2);
-
- struct ieee80211_cts {
- __le16 frame_control;
- __le16 duration;
- u8 ra[6];
--} __packed;
-+} __packed __aligned(2);
-
- struct ieee80211_pspoll {
- __le16 frame_control;
- __le16 aid;
- u8 bssid[6];
- u8 ta[6];
--} __packed;
-+} __packed __aligned(2);
-
- /* TDLS */
-