From 0b97565c8a8d2b80fc01b351f2ea9a869a1c4f29 Mon Sep 17 00:00:00 2001 From: Jake Day Date: Thu, 8 Feb 2018 07:16:29 -0500 Subject: [PATCH] updating wifi patches --- patches-4.14/wifi.patch | 12 ++++++++++++ patches-4.15/wifi.patch | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/patches-4.14/wifi.patch b/patches-4.14/wifi.patch index b06740540..dfaca0e7a 100644 --- a/patches-4.14/wifi.patch +++ b/patches-4.14/wifi.patch @@ -32,6 +32,18 @@ index 6e0d9a9..d008687 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 0edc5d6..c0c9c70 100644 +--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c ++++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c +@@ -998,6 +998,7 @@ mwifiex_cmd_timeout_func(unsigned long function_context) + if (cmd_node->wait_q_enabled) { + adapter->cmd_wait_q.status = -ETIMEDOUT; + mwifiex_cancel_pending_ioctl(adapter); ++ adapter->cmd_sent = false; + } + } + if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING) { diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c index e1aa860..328829b 100644 --- a/drivers/net/wireless/marvell/mwifiex/init.c diff --git a/patches-4.15/wifi.patch b/patches-4.15/wifi.patch index b06740540..dfaca0e7a 100644 --- a/patches-4.15/wifi.patch +++ b/patches-4.15/wifi.patch @@ -32,6 +32,18 @@ index 6e0d9a9..d008687 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 0edc5d6..c0c9c70 100644 +--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c ++++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c +@@ -998,6 +998,7 @@ mwifiex_cmd_timeout_func(unsigned long function_context) + if (cmd_node->wait_q_enabled) { + adapter->cmd_wait_q.status = -ETIMEDOUT; + mwifiex_cancel_pending_ioctl(adapter); ++ adapter->cmd_sent = false; + } + } + if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING) { diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c index e1aa860..328829b 100644 --- a/drivers/net/wireless/marvell/mwifiex/init.c