Merge branch 'master' of https://github.com/kaloz/mwlwifi10.3.0.17-20160531-1

5 files changed, 9 insertions, 3 deletions

diff --git a/dev.h b/dev.h
index 186e0ef..9e70bfe 100755..100644
--- a/dev.h
+++ b/dev.h
@@ -27,7 +27,7 @@
 #include <net/mac80211.h>
 
 #define MWL_DRV_NAME     KBUILD_MODNAME
-#define MWL_DRV_VERSION	 "10.3.0.17-20160531"
+#define MWL_DRV_VERSION	 "10.3.0.17-20160531-1"
 
 /* Map to 0x80000000 (Bus control) on BAR0 */
 #define MACREG_REG_H2A_INTERRUPT_EVENTS      0x00000C18 /* (From host to ARM) */
diff --git a/fwcmd.c b/fwcmd.c
index c055910..c055910 100755..100644
--- a/fwcmd.c
+++ b/fwcmd.c
diff --git a/fwcmd.h b/fwcmd.h
index fdb9fe8..fdb9fe8 100755..100644
--- a/fwcmd.h
+++ b/fwcmd.h
diff --git a/hostcmd.h b/hostcmd.h
index 63199f6..63199f6 100755..100644
--- a/hostcmd.h
+++ b/hostcmd.h
diff --git a/rx.c b/rx.c
index 76f0c10..1383655 100644
--- a/rx.c
+++ b/rx.c
@@ -535,10 +535,16 @@ void mwl_rx_recv(unsigned long data)
 			 * this bss. If yes, set the status flags
 			 * accordingly
 			 */
-			if (ieee80211_has_tods(wh->frame_control))
+			if (ieee80211_has_tods(wh->frame_control)) {
 				mwl_vif = mwl_rx_find_vif_bss(priv, wh->addr1);
-			else
+				if (!mwl_vif &&
+				    ieee80211_has_a4(wh->frame_control))
+					mwl_vif =
+						mwl_rx_find_vif_bss(priv,
+								    wh->addr2);
+			} else {
 				mwl_vif = mwl_rx_find_vif_bss(priv, wh->addr2);
+			}
 
 			if  ((mwl_vif && mwl_vif->is_hw_crypto_enabled) ||
 			     is_multicast_ether_addr(wh->addr1) ||