mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-25 11:55:37 +00:00
staging: wilc1000: avoid overriding powersave state
Don't override powersave state with respect to the open interfaces and let the firmware take care of when it's appropriate to do so Signed-off-by: Adham Abozaeid <adham.abozaeid@microchip.com> Link: https://lore.kernel.org/r/20190725213125.2810-5-adham.abozaeid@microchip.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
5a28d3fd40
commit
ded11ab181
3 changed files with 3 additions and 24 deletions
|
@ -679,8 +679,6 @@ static inline void host_int_parse_assoc_resp_info(struct wilc_vif *vif,
|
|||
if (mac_status == WILC_MAC_STATUS_CONNECTED &&
|
||||
conn_info->status == WLAN_STATUS_SUCCESS) {
|
||||
ether_addr_copy(hif_drv->assoc_bssid, conn_info->bssid);
|
||||
wilc_set_power_mgmt(vif, 0, 0);
|
||||
|
||||
hif_drv->hif_state = HOST_IF_CONNECTED;
|
||||
} else {
|
||||
hif_drv->hif_state = HOST_IF_IDLE;
|
||||
|
@ -704,14 +702,11 @@ static inline void host_int_handle_disconnect(struct wilc_vif *vif)
|
|||
handle_scan_done(vif, SCAN_EVENT_ABORTED);
|
||||
}
|
||||
|
||||
if (hif_drv->conn_info.conn_result) {
|
||||
wilc_set_power_mgmt(vif, 0, 0);
|
||||
|
||||
if (hif_drv->conn_info.conn_result)
|
||||
hif_drv->conn_info.conn_result(CONN_DISCONN_EVENT_DISCONN_NOTIF,
|
||||
0, hif_drv->conn_info.arg);
|
||||
} else {
|
||||
else
|
||||
netdev_err(vif->ndev, "%s: conn_result is NULL\n", __func__);
|
||||
}
|
||||
|
||||
eth_zero_addr(hif_drv->assoc_bssid);
|
||||
|
||||
|
@ -767,8 +762,6 @@ int wilc_disconnect(struct wilc_vif *vif)
|
|||
wid.val = (s8 *)&dummy_reason_code;
|
||||
wid.size = sizeof(char);
|
||||
|
||||
wilc_set_power_mgmt(vif, 0, 0);
|
||||
|
||||
result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1);
|
||||
if (result) {
|
||||
netdev_err(vif->ndev, "Failed to send disconnect\n");
|
||||
|
|
|
@ -1393,8 +1393,7 @@ static int set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
|
|||
if (!priv->hif_drv)
|
||||
return -EIO;
|
||||
|
||||
if (vif->wilc->enable_ps)
|
||||
wilc_set_power_mgmt(vif, enabled, timeout);
|
||||
wilc_set_power_mgmt(vif, enabled, timeout);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -1424,9 +1423,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
|
|||
|
||||
memset(priv->assoc_stainfo.sta_associated_bss, 0,
|
||||
WILC_MAX_NUM_STA * ETH_ALEN);
|
||||
|
||||
wl->enable_ps = true;
|
||||
wilc_set_power_mgmt(vif, 1, 0);
|
||||
break;
|
||||
|
||||
case NL80211_IFTYPE_P2P_CLIENT:
|
||||
|
@ -1437,12 +1433,9 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
|
|||
vif->iftype = WILC_CLIENT_MODE;
|
||||
wilc_set_operation_mode(vif, WILC_STATION_MODE);
|
||||
|
||||
wl->enable_ps = false;
|
||||
wilc_set_power_mgmt(vif, 0, 0);
|
||||
break;
|
||||
|
||||
case NL80211_IFTYPE_AP:
|
||||
wl->enable_ps = false;
|
||||
dev->ieee80211_ptr->iftype = type;
|
||||
priv->wdev.iftype = type;
|
||||
vif->iftype = WILC_AP_MODE;
|
||||
|
@ -1451,7 +1444,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
|
|||
wilc_set_wfi_drv_handler(vif, wilc_get_vif_idx(vif),
|
||||
0, vif->idx);
|
||||
wilc_set_operation_mode(vif, WILC_AP_MODE);
|
||||
wilc_set_power_mgmt(vif, 0, 0);
|
||||
}
|
||||
break;
|
||||
|
||||
|
@ -1460,9 +1452,6 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
|
|||
dev->ieee80211_ptr->iftype = type;
|
||||
priv->wdev.iftype = type;
|
||||
vif->iftype = WILC_GO_MODE;
|
||||
|
||||
wl->enable_ps = false;
|
||||
wilc_set_power_mgmt(vif, 0, 0);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
@ -1484,7 +1473,6 @@ static int start_ap(struct wiphy *wiphy, struct net_device *dev,
|
|||
netdev_err(dev, "Error in setting channel\n");
|
||||
|
||||
wilc_wlan_set_bssid(dev, dev->dev_addr, WILC_AP_MODE);
|
||||
wilc_set_power_mgmt(vif, 0, 0);
|
||||
|
||||
return wilc_add_beacon(vif, settings->beacon_interval,
|
||||
settings->dtim_period, &settings->beacon);
|
||||
|
@ -1835,7 +1823,6 @@ int wilc_cfg80211_init(struct wilc **wilc, struct device *dev, int io_type,
|
|||
*wilc = wl;
|
||||
wl->io_type = io_type;
|
||||
wl->hif_func = ops;
|
||||
wl->enable_ps = false;
|
||||
wl->chip_ps_state = WILC_CHIP_WAKEDUP;
|
||||
INIT_LIST_HEAD(&wl->txq_head.list);
|
||||
INIT_LIST_HEAD(&wl->rxq_head.list);
|
||||
|
|
|
@ -261,7 +261,6 @@ struct wilc {
|
|||
struct device *dev;
|
||||
bool suspend_event;
|
||||
|
||||
bool enable_ps;
|
||||
int clients_count;
|
||||
struct workqueue_struct *hif_workqueue;
|
||||
enum chip_ps_states chip_ps_state;
|
||||
|
|
Loading…
Reference in a new issue