|
@@ -1,4 +1,4 @@
|
|
|
-From 9b82f30679795c4c1ca55d7095cdd67e6e06fcde Mon Sep 17 00:00:00 2001
|
|
|
+From e9076b84d446d05265717b73de4f77e302e78598 Mon Sep 17 00:00:00 2001
|
|
|
From: kitakar5525 <34676735+kitakar5525@users.noreply.github.com>
|
|
|
Date: Thu, 20 Feb 2020 16:51:11 +0900
|
|
|
Subject: [PATCH 2/6] wifi
|
|
@@ -6,15 +6,13 @@ Subject: [PATCH 2/6] wifi
|
|
|
---
|
|
|
drivers/net/wireless/marvell/mwifiex/Makefile | 1 +
|
|
|
.../net/wireless/marvell/mwifiex/cfg80211.c | 26 ++
|
|
|
- drivers/net/wireless/marvell/mwifiex/fw.h | 2 +-
|
|
|
drivers/net/wireless/marvell/mwifiex/main.c | 6 +-
|
|
|
drivers/net/wireless/marvell/mwifiex/pcie.c | 84 ++++--
|
|
|
drivers/net/wireless/marvell/mwifiex/pcie.h | 3 +
|
|
|
.../wireless/marvell/mwifiex/pcie_quirks.c | 255 ++++++++++++++++++
|
|
|
.../wireless/marvell/mwifiex/pcie_quirks.h | 17 ++
|
|
|
.../net/wireless/marvell/mwifiex/sta_cmd.c | 14 +-
|
|
|
- .../wireless/marvell/mwifiex/sta_cmdresp.c | 4 +-
|
|
|
- 10 files changed, 377 insertions(+), 35 deletions(-)
|
|
|
+ 8 files changed, 374 insertions(+), 32 deletions(-)
|
|
|
create mode 100644 drivers/net/wireless/marvell/mwifiex/pcie_quirks.c
|
|
|
create mode 100644 drivers/net/wireless/marvell/mwifiex/pcie_quirks.h
|
|
|
|
|
@@ -74,19 +72,6 @@ index 4e4f59c17ded..528eedfbf41c 100644
|
|
|
return mwifiex_drv_set_power(priv, &ps_mode);
|
|
|
}
|
|
|
|
|
|
-diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
|
|
|
-index 8047e307892e..d9f8bdbc817b 100644
|
|
|
---- a/drivers/net/wireless/marvell/mwifiex/fw.h
|
|
|
-+++ b/drivers/net/wireless/marvell/mwifiex/fw.h
|
|
|
-@@ -954,7 +954,7 @@ struct mwifiex_tkip_param {
|
|
|
- struct mwifiex_aes_param {
|
|
|
- u8 pn[WPA_PN_SIZE];
|
|
|
- __le16 key_len;
|
|
|
-- u8 key[WLAN_KEY_LEN_CCMP];
|
|
|
-+ u8 key[WLAN_KEY_LEN_CCMP_256];
|
|
|
- } __packed;
|
|
|
-
|
|
|
- struct mwifiex_wapi_param {
|
|
|
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
|
|
|
index 529099137644..a26eb66865e2 100644
|
|
|
--- a/drivers/net/wireless/marvell/mwifiex/main.c
|
|
@@ -640,28 +625,6 @@ index 8bd355d7974e..484ba60b51ab 100644
|
|
|
|
|
|
if (drcs) {
|
|
|
adapter->drcs_enabled = true;
|
|
|
-diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
|
|
|
-index 962d8bfe6f10..119ccacd1fcc 100644
|
|
|
---- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
|
|
|
-+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
|
|
|
-@@ -619,7 +619,7 @@ static int mwifiex_ret_802_11_key_material_v2(struct mwifiex_private *priv,
|
|
|
- key_v2 = &resp->params.key_material_v2;
|
|
|
-
|
|
|
- len = le16_to_cpu(key_v2->key_param_set.key_params.aes.key_len);
|
|
|
-- if (len > WLAN_KEY_LEN_CCMP)
|
|
|
-+ if (len > sizeof(key_v2->key_param_set.key_params.aes.key))
|
|
|
- return -EINVAL;
|
|
|
-
|
|
|
- if (le16_to_cpu(key_v2->action) == HostCmd_ACT_GEN_SET) {
|
|
|
-@@ -635,7 +635,7 @@ static int mwifiex_ret_802_11_key_material_v2(struct mwifiex_private *priv,
|
|
|
- return 0;
|
|
|
-
|
|
|
- memset(priv->aes_key_v2.key_param_set.key_params.aes.key, 0,
|
|
|
-- WLAN_KEY_LEN_CCMP);
|
|
|
-+ sizeof(key_v2->key_param_set.key_params.aes.key));
|
|
|
- priv->aes_key_v2.key_param_set.key_params.aes.key_len =
|
|
|
- cpu_to_le16(len);
|
|
|
- memcpy(priv->aes_key_v2.key_param_set.key_params.aes.key,
|
|
|
--
|
|
|
2.28.0
|
|
|
|