From 23c84be3f91f62a52b3004ee9fefcfe26e9934dc Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 2 Feb 2013 15:55:00 -0600 Subject: [PATCH] --- yaml --- r: 349663 b: refs/heads/master c: a5ffbe0a1993a27072742ef7db6cf9839956fce9 h: refs/heads/master i: 349661: 779cadbe78f8cb83410f3ed2ff00fe046f17bceb 349659: 56bd17467c90dadaafd93234dc4967fb4a2a2b9e 349655: e5252dcb965881258899441f74192930fbfcfa5c 349647: 8cdae19510bc21fc59f8d4089594dd5e2b585703 349631: 1dc92fb4c189fb40e2196636be3d9b508dbd642e v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rtlwifi/base.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d949c0c40ce0..d28530173a00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c52d3d3fdef532a6e372865d1f15632abf5fc82 +refs/heads/master: a5ffbe0a1993a27072742ef7db6cf9839956fce9 diff --git a/trunk/drivers/net/wireless/rtlwifi/base.c b/trunk/drivers/net/wireless/rtlwifi/base.c index 4494d130b37c..0f8b05185eda 100644 --- a/trunk/drivers/net/wireless/rtlwifi/base.c +++ b/trunk/drivers/net/wireless/rtlwifi/base.c @@ -1004,7 +1004,8 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) is_tx ? "Tx" : "Rx"); if (is_tx) { - rtl_lps_leave(hw); + schedule_work(&rtlpriv-> + works.lps_leave_work); ppsc->last_delaylps_stamp_jiffies = jiffies; } @@ -1014,7 +1015,7 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) } } else if (ETH_P_ARP == ether_type) { if (is_tx) { - rtl_lps_leave(hw); + schedule_work(&rtlpriv->works.lps_leave_work); ppsc->last_delaylps_stamp_jiffies = jiffies; } @@ -1024,7 +1025,7 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) "802.1X %s EAPOL pkt!!\n", is_tx ? "Tx" : "Rx"); if (is_tx) { - rtl_lps_leave(hw); + schedule_work(&rtlpriv->works.lps_leave_work); ppsc->last_delaylps_stamp_jiffies = jiffies; }