From 5220b8684e34097635697003b0ea78ef081974fe Mon Sep 17 00:00:00 2001 From: David Lin Date: Tue, 31 May 2016 17:44:24 +0800 Subject: Commit mwlwifi driver 10.3.0.17-20160531-1 Modified receive code to pass wds data to mac80211 when security is on. Signed-off-by: David Lin --- dev.h | 2 +- fwcmd.c | 0 fwcmd.h | 0 hostcmd.h | 0 rx.c | 10 ++++++++-- 5 files changed, 9 insertions(+), 3 deletions(-) mode change 100755 => 100644 dev.h mode change 100755 => 100644 fwcmd.c mode change 100755 => 100644 fwcmd.h mode change 100755 => 100644 hostcmd.h diff --git a/dev.h b/dev.h old mode 100755 new mode 100644 index 2d69278..7982fcf --- a/dev.h +++ b/dev.h @@ -27,7 +27,7 @@ #include #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 old mode 100755 new mode 100644 diff --git a/fwcmd.h b/fwcmd.h old mode 100755 new mode 100644 diff --git a/hostcmd.h b/hostcmd.h old mode 100755 new mode 100644 diff --git a/rx.c b/rx.c index d71ea2d..7831bb7 100644 --- a/rx.c +++ b/rx.c @@ -537,10 +537,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) || -- cgit v1.2.3