aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtlwifi/core.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-02-21 15:06:35 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-02-21 15:06:35 -0500
commita9802d43f205faa2fff422502a1336a50b9615c3 (patch)
tree57152d6c84556320570802d01bbe04cefd8a2a7d /drivers/net/wireless/rtlwifi/core.c
parent0b0a635f79f91f3755b6518627ea06dd0dbfd523 (diff)
parentca994a36f585432458ead9133fcfe05440edbb7b (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/rtlwifi/core.c')
-rw-r--r--drivers/net/wireless/rtlwifi/core.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index f231b9180436..278e9f957e0d 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -296,12 +296,10 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
296 * because that will cause nullfunc send by mac80211 296 * because that will cause nullfunc send by mac80211
297 * fail, and cause pkt loss, we have tested that 5mA 297 * fail, and cause pkt loss, we have tested that 5mA
298 * is worked very well */ 298 * is worked very well */
299 if (!rtlpriv->psc.multi_buffered) { 299 if (!rtlpriv->psc.multi_buffered)
300 queue_delayed_work(rtlpriv->works.rtl_wq, 300 queue_delayed_work(rtlpriv->works.rtl_wq,
301 &rtlpriv->works.ps_work, 301 &rtlpriv->works.ps_work,
302 MSECS(5)); 302 MSECS(5));
303 pr_info("In section\n");
304 }
305 } else { 303 } else {
306 rtl_swlps_rf_awake(hw); 304 rtl_swlps_rf_awake(hw);
307 rtlpriv->psc.sw_ps_enabled = false; 305 rtlpriv->psc.sw_ps_enabled = false;