updating wifi patch
This commit is contained in:
parent
a5c410e28b
commit
3924bc095b
|
@ -1,8 +1,3 @@
|
|||
diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
--
|
||||
2.20.1
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
|
||||
index 042a1d07f686..fc9041f58e9f 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c
|
||||
|
@ -34,7 +29,7 @@ index 4b5ae9098504..754c6f755c7b 100644
|
|||
return mwifiex_drv_set_power(priv, &ps_mode);
|
||||
}
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
|
||||
index 9cfcdf6bec52..45a04eb66bc6 100644
|
||||
index 9cfcdf6bec52..9357a9ae13d4 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
|
||||
@@ -997,6 +997,7 @@ mwifiex_cmd_timeout_func(struct timer_list *t)
|
||||
|
@ -45,6 +40,26 @@ index 9cfcdf6bec52..45a04eb66bc6 100644
|
|||
}
|
||||
}
|
||||
if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING) {
|
||||
@@ -1573,6 +1574,7 @@ int mwifiex_ret_get_hw_spec(struct mwifiex_private *priv,
|
||||
adapter->key_api_minor_ver);
|
||||
break;
|
||||
case FW_API_VER_ID:
|
||||
+ case FW_KEY_API_VER_ID:
|
||||
adapter->fw_api_ver =
|
||||
api_rev->major_ver;
|
||||
mwifiex_dbg(adapter, INFO,
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
|
||||
index b73f99dc5a72..d96a0ffc9649 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/fw.h
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/fw.h
|
||||
@@ -1052,6 +1052,7 @@ struct host_cmd_ds_802_11_ps_mode_enh {
|
||||
enum API_VER_ID {
|
||||
KEY_API_VER_ID = 1,
|
||||
FW_API_VER_ID = 2,
|
||||
+ FW_KEY_API_VER_ID = 4,
|
||||
};
|
||||
|
||||
struct hw_spec_api_rev {
|
||||
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
|
||||
index 510f6b8e717d..a8a030496a36 100644
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/main.c
|
||||
|
@ -244,4 +259,7 @@ index d536b07582f8..17fd97e9d857 100644
|
|||
+
|
||||
nl80211_send_connect_result(wiphy_to_rdev(wdev->wiphy), dev, cr,
|
||||
GFP_KERNEL);
|
||||
|
||||
|
||||
diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
|
|
Loading…
Reference in a new issue