Re: [1/3] mwifiex: code rearrangement in suspend handler

[Kalle Valo]

Amitkumar Karwar  wrote:
> We will derive sta_priv at the beginning of suspend handler.
> This will be useful for next patch in this series.
> 
> Signed-off-by: Amitkumar Karwar 

Thanks, 3 patches applied to wireless-drivers-next.git:

322397b268f7 mwifiex: code rearrangement in suspend handler
09e672a16b92 mwifiex: clear scan_aborting flag
16d25da94f3d mwifiex: fix NULL pointer dereference during suspend

-- 
Sent by pwcli
https://patchwork.kernel.org/patch/9200033/

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/3] mwifiex: code rearrangement in suspend handler

[Amitkumar Karwar]

We will derive sta_priv at the beginning of suspend handler.
This will be useful for next patch in this series.

Signed-off-by: Amitkumar Karwar 
---
 drivers/net/wireless/marvell/mwifiex/cfg80211.c | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c 
b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
index 81ff8bb..31f7b79 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
@@ -3311,6 +3311,8 @@ static int mwifiex_cfg80211_suspend(struct wiphy *wiphy,
struct mwifiex_ds_hs_cfg hs_cfg;
int i, ret = 0, retry_num = 10;
struct mwifiex_private *priv;
+   struct mwifiex_private *sta_priv =
+   mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA);
 
for (i = 0; i < adapter->priv_num; i++) {
priv = adapter->priv[i];
@@ -3343,15 +3345,13 @@ static int mwifiex_cfg80211_suspend(struct wiphy *wiphy,
return 0;
}
 
-   priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA);
-
-   if (!priv->media_connected && !wowlan->nd_config) {
+   if (!sta_priv->media_connected && !wowlan->nd_config) {
mwifiex_dbg(adapter, ERROR,
"Can not configure WOWLAN in disconnected state\n");
return 0;
}
 
-   ret = mwifiex_set_mef_filter(priv, wowlan);
+   ret = mwifiex_set_mef_filter(sta_priv, wowlan);
if (ret) {
mwifiex_dbg(adapter, ERROR, "Failed to set MEF filter\n");
return ret;
@@ -3363,19 +3363,19 @@ static int mwifiex_cfg80211_suspend(struct wiphy *wiphy,
if (wowlan->nd_config) {
mwifiex_dbg(adapter, INFO, "Wake on net detect\n");
hs_cfg.conditions |= HS_CFG_COND_MAC_EVENT;
-   mwifiex_cfg80211_sched_scan_start(wiphy, priv->netdev,
+   mwifiex_cfg80211_sched_scan_start(wiphy, sta_priv->netdev,
  wowlan->nd_config);
}
 
if (wowlan->disconnect) {
hs_cfg.conditions |= HS_CFG_COND_MAC_EVENT;
-   mwifiex_dbg(priv->adapter, INFO, "Wake on device disconnect\n");
+   mwifiex_dbg(sta_priv->adapter, INFO, "Wake on device 
disconnect\n");
}
 
hs_cfg.is_invoke_hostcmd = false;
hs_cfg.gpio = adapter->hs_cfg.gpio;
hs_cfg.gap = adapter->hs_cfg.gap;
-   ret = mwifiex_set_hs_params(priv, HostCmd_ACT_GEN_SET,
+   ret = mwifiex_set_hs_params(sta_priv, HostCmd_ACT_GEN_SET,
MWIFIEX_SYNC_CMD, _cfg);
if (ret) {
mwifiex_dbg(adapter, ERROR,
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html