Commit 7d641072 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville

brcmfmac: add virtual interface support in brcmf_cfg80211_suspend()

With multiple interfaces suspend will need to iterate over all and
bring down the link.
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ba40d166
...@@ -3008,46 +3008,49 @@ static s32 brcmf_cfg80211_suspend(struct wiphy *wiphy, ...@@ -3008,46 +3008,49 @@ static s32 brcmf_cfg80211_suspend(struct wiphy *wiphy,
{ {
struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy); struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
struct net_device *ndev = cfg_to_ndev(cfg); struct net_device *ndev = cfg_to_ndev(cfg);
struct brcmf_if *ifp = netdev_priv(ndev); struct brcmf_cfg80211_vif *vif;
WL_TRACE("Enter\n"); WL_TRACE("Enter\n");
/* /*
* Check for BRCMF_VIF_STATUS_READY before any function call which * if the primary net_device is not READY there is nothing
* could result is bus access. Don't block the suspend for * we can do but pray resume goes smoothly.
* any driver error conditions
*/
/*
* While going to suspend if associated with AP disassociate
* from AP to save power while system is in suspended state
*/ */
if ((test_bit(BRCMF_VIF_STATUS_CONNECTED, &ifp->vif->sme_state) || vif = ((struct brcmf_if *)netdev_priv(ndev))->vif;
test_bit(BRCMF_VIF_STATUS_CONNECTING, &ifp->vif->sme_state)) && if (!check_vif_up(vif))
check_vif_up(ifp->vif)) { goto exit;
WL_INFO("Disassociating from AP"
" while entering suspend state\n");
brcmf_link_down(cfg);
list_for_each_entry(vif, &cfg->vif_list, list) {
if (!test_bit(BRCMF_VIF_STATUS_READY, &vif->sme_state))
continue;
/* /*
* Make sure WPA_Supplicant receives all the event * While going to suspend if associated with AP disassociate
* generated due to DISASSOC call to the fw to keep * from AP to save power while system is in suspended state
* the state fw and WPA_Supplicant state consistent
*/ */
brcmf_delay(500); if (test_bit(BRCMF_VIF_STATUS_CONNECTED, &vif->sme_state) ||
test_bit(BRCMF_VIF_STATUS_CONNECTING, &vif->sme_state)) {
WL_INFO("Disassociating from AP before suspend\n");
brcmf_link_down(cfg);
/* Make sure WPA_Supplicant receives all the event
* generated due to DISASSOC call to the fw to keep
* the state fw and WPA_Supplicant state consistent
*/
brcmf_delay(500);
}
} }
if (test_bit(BRCMF_VIF_STATUS_READY, &ifp->vif->sme_state)) /* end any scanning */
if (test_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status))
brcmf_abort_scanning(cfg); brcmf_abort_scanning(cfg);
else
clear_bit(BRCMF_SCAN_STATUS_BUSY, &cfg->scan_status);
/* Turn off watchdog timer */ /* Turn off watchdog timer */
if (test_bit(BRCMF_VIF_STATUS_READY, &ifp->vif->sme_state)) brcmf_set_mpc(ndev, 1);
brcmf_set_mpc(ndev, 1);
exit:
WL_TRACE("Exit\n"); WL_TRACE("Exit\n");
/* clear any scanning activity */
cfg->scan_status = 0;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment