aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2012-03-02 16:23:36 -0500
committerLuis Henriques <luis.henriques@canonical.com>2012-04-05 11:17:21 -0400
commit20237ed6ccada75b001add94adc7ca4274b572dd (patch)
tree99c4a47e413f7b31ab969ca190afd23bc98bb48a /drivers/net/wireless
parent01e5cfdbad88cc93c34b55b0015587375acffed4 (diff)
rtlwifi: rtl8192c: Prevent sleeping from invalid context in rtl8192cu
BugLink: http://bugs.launchpad.net/bugs/971808 commit ebecdcc12fed5d3c81853dea61a0a78a5aefab52 upstream. When driver rtl8192cu is used with the debug level set to 3 or greater, the result is "sleeping function called from invalid context" due to an rcu_read_lock() call in the DM refresh routine in driver rtl8192c. This lock is not necessary as the USB driver does not use the struct being protected, thus the lock is set only when a PCI interface is active. This bug is reported in https://bugzilla.kernel.org/show_bug.cgi?id=42775. Reported-by: Ronald Wahl <ronald.wahl@raritan.com> Tested-by: Ronald Wahl <ronald.wahl@raritan.com> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Cc: Ronald Wahl <ronald.wahl@raritan.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index 97183829b9b..27f2f5df21f 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -1218,13 +1218,18 @@ static void rtl92c_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
1218 ("PreState = %d, CurState = %d\n", 1218 ("PreState = %d, CurState = %d\n",
1219 p_ra->pre_ratr_state, p_ra->ratr_state)); 1219 p_ra->pre_ratr_state, p_ra->ratr_state));
1220 1220
1221 rcu_read_lock(); 1221 /* Only the PCI card uses sta in the update rate table
1222 sta = ieee80211_find_sta(mac->vif, mac->bssid); 1222 * callback routine */
1223 if (rtlhal->interface == INTF_PCI) {
1224 rcu_read_lock();
1225 sta = ieee80211_find_sta(mac->vif, mac->bssid);
1226 }
1223 rtlpriv->cfg->ops->update_rate_tbl(hw, sta, 1227 rtlpriv->cfg->ops->update_rate_tbl(hw, sta,
1224 p_ra->ratr_state); 1228 p_ra->ratr_state);
1225 1229
1226 p_ra->pre_ratr_state = p_ra->ratr_state; 1230 p_ra->pre_ratr_state = p_ra->ratr_state;
1227 rcu_read_unlock(); 1231 if (rtlhal->interface == INTF_PCI)
1232 rcu_read_unlock();
1228 } 1233 }
1229 } 1234 }
1230} 1235}