diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-10 12:01:08 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-10 12:01:08 +0800 |
| commit | f02e043c5ee3014ba0fbae38e699008385c99d7b (patch) | |
| tree | ab9f9456cfda25688e7d3b2641c8011c4d867246 /drivers/net/wireless/realtek/rtlwifi/core.c | |
| parent | eaa88578f2135fa8548d5f127259904a1b3f44c0 (diff) | |
| parent | cdd86b9722657feffdca5a12ecc34c30be64e618 (diff) | |
Merge tag 'v4.4.41' into linux-linaro-lsk-v4.4
This is the 4.4.41 stable release
Diffstat (limited to 'drivers/net/wireless/realtek/rtlwifi/core.c')
| -rw-r--r-- | drivers/net/wireless/realtek/rtlwifi/core.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c index c925a4dff599..e36d8c456275 100644 --- a/drivers/net/wireless/realtek/rtlwifi/core.c +++ b/drivers/net/wireless/realtek/rtlwifi/core.c @@ -1153,10 +1153,8 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, } else { mstatus = RT_MEDIA_DISCONNECT; - if (mac->link_state == MAC80211_LINKED) { - rtlpriv->enter_ps = false; - schedule_work(&rtlpriv->works.lps_change_work); - } + if (mac->link_state == MAC80211_LINKED) + rtl_lps_leave(hw); if (ppsc->p2p_ps_info.p2p_ps_mode > P2P_PS_NONE) rtl_p2p_ps_cmd(hw, P2P_PS_DISABLE); mac->link_state = MAC80211_NOLINK; @@ -1432,8 +1430,7 @@ static void rtl_op_sw_scan_start(struct ieee80211_hw *hw, } if (mac->link_state == MAC80211_LINKED) { - rtlpriv->enter_ps = false; - schedule_work(&rtlpriv->works.lps_change_work); + rtl_lps_leave(hw); mac->link_state = MAC80211_LINKED_SCANNING; } else { rtl_ips_nic_on(hw); |