diff options
author | Bjørn Mork <bjorn@mork.no> | 2016-05-31 16:28:48 +0200 |
---|---|---|
committer | Bjørn Mork <bjorn@mork.no> | 2016-05-31 16:28:48 +0200 |
commit | a602e201b4401fb722d5b3e53424f794d523290e (patch) | |
tree | bb9580960473bd1bb261d8a799d0db24e580b85e | |
parent | 520d7d9d2afb08be80df8e357a0d00df8c4cc06d (diff) | |
parent | 5220b8684e34097635697003b0ea78ef081974fe (diff) |
Merge branch 'master' of https://github.com/kaloz/mwlwifi10.3.0.17-20160531-1
-rw-r--r--[-rwxr-xr-x] | dev.h | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | fwcmd.c | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | fwcmd.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | hostcmd.h | 0 | ||||
-rw-r--r-- | rx.c | 10 |
5 files changed, 9 insertions, 3 deletions
@@ -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/hostcmd.h b/hostcmd.h index 63199f6..63199f6 100755..100644 --- a/hostcmd.h +++ b/hostcmd.h @@ -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) || |