|
|
@@ -112,7 +112,7 @@ new file mode 100644
|
|
|
index 000000000000..a9bcb9cd4100
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/net/wireless/marvell/mwlwifi/Kconfig
|
|
|
-@@ -0,0 +1,23 @@
|
|
|
+@@ -0,0 +1,22 @@
|
|
|
+config MWLWIFI
|
|
|
+ tristate "Marvell Avastar 88W8864/88W8897 PCIe driver (mac80211 compatible)"
|
|
|
+ depends on PCI && MAC80211
|
|
|
@@ -135,7 +135,6 @@ index 000000000000..a9bcb9cd4100
|
|
|
+ select either MWIFIEX or MWLWIFI, not both. MWIFIEX is fullmac,
|
|
|
+ supporting more comprehensive client functions for laptops/embedded
|
|
|
+ devices. MWLWIFI is mac80211-based for full AP/Wireless Bridge.
|
|
|
-+
|
|
|
diff --git a/drivers/net/wireless/marvell/mwlwifi/Makefile b/drivers/net/wireless/marvell/mwlwifi/Makefile
|
|
|
new file mode 100644
|
|
|
index 000000000000..061833703c7f
|
|
|
@@ -226,7 +225,7 @@ index 000000000000..788c5d4dc80d
|
|
|
+ commit 03a72eacda5d9a1837a74387081596a0d5466ec1
|
|
|
+ Author: Jouni Malinen <jouni@qca.qualcomm.com>
|
|
|
+ Date: Thu Dec 17 18:39:19 2015 +0200
|
|
|
-+
|
|
|
++
|
|
|
+ VHT: Add an interoperability workaround for 80+80 and 160 MHz channels
|
|
|
+
|
|
|
+ Number of deployed 80 MHz capable VHT stations that do not support 80+80
|
|
|
@@ -257,10 +256,10 @@ index 000000000000..788c5d4dc80d
|
|
|
+
|
|
|
+ #Disable 5g band
|
|
|
+ marvell,5ghz = <0>;
|
|
|
-+
|
|
|
++
|
|
|
+ #Specify antenna number, default is 4x4. For WRT1200AC, you must set these values to 2x2.
|
|
|
+ marvell,chainmask = <4 4>;
|
|
|
-+
|
|
|
++
|
|
|
+ #Specify external power table. If your device needs external power table, you must provide the power table via this parameter, otherwise the Tx power will be pretty low.
|
|
|
+ marvell,powertable
|
|
|
+ ```
|
|
|
@@ -269,7 +268,7 @@ index 000000000000..788c5d4dc80d
|
|
|
+ ```sh
|
|
|
+ cat /sys/kernel/debug/ieee80211/phy0/mwlwifi/info
|
|
|
+ ```
|
|
|
-+
|
|
|
++
|
|
|
+ You should see a line in the results which looks like the following:
|
|
|
+ ```sh
|
|
|
+ power table loaded from dts: no
|
|
|
@@ -293,7 +292,7 @@ index 000000000000..788c5d4dc80d
|
|
|
+ There are two ways to resolve this problem:
|
|
|
+ * Please don't change country code and let mwlwifi set it for you.
|
|
|
+ * Remove phy2. Under this case, even though you change country code, mwlwifi will reject it. Because phy2 is not existed, country code setting won't be conflicted. To do this, run the following commands (for OpenWrt/LEDE):
|
|
|
-+
|
|
|
++
|
|
|
+ ```sh
|
|
|
+ opkg remove kmod-mwifiex-sdio
|
|
|
+ opkg remove mwifiex-sdio-firmware
|
|
|
@@ -17414,9 +17413,9 @@ index 000000000000..adadd2e4d8d4
|
|
|
+--- a/src/ap/ieee802_11_vht.c
|
|
|
++++ b/src/ap/ieee802_11_vht.c
|
|
|
+@@ -82,6 +82,27 @@ u8 * hostapd_eid_vht_operation(struct hostapd_data *hapd, u8 *eid)
|
|
|
-+
|
|
|
-+ oper->vht_op_info_chwidth = hapd->iconf->vht_oper_chwidth;
|
|
|
-+
|
|
|
++
|
|
|
++ oper->vht_op_info_chwidth = hapd->iconf->vht_oper_chwidth;
|
|
|
++
|
|
|
++ if (hapd->iconf->vht_oper_chwidth == 2) {
|
|
|
++ /*
|
|
|
++ * Convert 160 MHz channel width to new style as interop
|
|
|
@@ -17438,16 +17437,16 @@ index 000000000000..adadd2e4d8d4
|
|
|
++ oper->vht_op_info_chwidth = 1;
|
|
|
++ }
|
|
|
++
|
|
|
-+ /* VHT Basic MCS set comes from hw */
|
|
|
-+ /* Hard code 1 stream, MCS0-7 is a min Basic VHT MCS rates */
|
|
|
-+ oper->vht_basic_mcs_set = host_to_le16(0xfffc);
|
|
|
++ /* VHT Basic MCS set comes from hw */
|
|
|
++ /* Hard code 1 stream, MCS0-7 is a min Basic VHT MCS rates */
|
|
|
++ oper->vht_basic_mcs_set = host_to_le16(0xfffc);
|
|
|
diff --git a/drivers/net/wireless/marvell/mwlwifi/hostapd/README b/drivers/net/wireless/marvell/mwlwifi/hostapd/README
|
|
|
new file mode 100644
|
|
|
index 000000000000..a5fb2b68d3d3
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/net/wireless/marvell/mwlwifi/hostapd/README
|
|
|
@@ -0,0 +1,26 @@
|
|
|
-+700-interoperability-workaround-for-80+80-and-160-MHz-channels:
|
|
|
++700-interoperability-workaround-for-80+80-and-160-MHz-channels:
|
|
|
+
|
|
|
+patch for OpenWrt hostapd package 2016-01-15 for following commit
|
|
|
+(move it to package/network/services/hostapd/patches).
|
|
|
@@ -18417,7 +18416,7 @@ new file mode 100644
|
|
|
index 000000000000..74ab054f947e
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/net/wireless/marvell/mwlwifi/mu_mimo.c
|
|
|
-@@ -0,0 +1,21 @@
|
|
|
+@@ -0,0 +1,20 @@
|
|
|
+/*
|
|
|
+ * Copyright (C) 2006-2018, Marvell International Ltd.
|
|
|
+ *
|
|
|
@@ -18438,7 +18437,6 @@ index 000000000000..74ab054f947e
|
|
|
+#include "sysadpt.h"
|
|
|
+#include "core.h"
|
|
|
+#include "mu_mimo.h"
|
|
|
-+
|
|
|
diff --git a/drivers/net/wireless/marvell/mwlwifi/mu_mimo.h b/drivers/net/wireless/marvell/mwlwifi/mu_mimo.h
|
|
|
new file mode 100644
|
|
|
index 000000000000..24179f404774
|
Maximilian Luz