DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: wireless: bcmdhd: Remove unnecessary rtnl_lock() calls

Browse Source 
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
Dmitry Shmidt
2011-09-23 13:52:01 -07:00
parent 36cc2d0c3a
commit 3e59ce0fde
1 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
drivers/net/wireless/bcmdhd/wl_cfg80211.c
View File

@@ -809,6 +809,8 @@ wl_cfg80211_add_virtual_iface(struct wiphy *wiphy, char *name,
struct net_device *_ndev; struct net_device *_ndev;
dhd_pub_t *dhd = (dhd_pub_t *)(wl->pub); dhd_pub_t *dhd = (dhd_pub_t *)(wl->pub);
int (*net_attach)(dhd_pub_t *dhdp, int ifidx); int (*net_attach)(dhd_pub_t *dhdp, int ifidx);
bool rollback_lock = false;
WL_DBG(("if name: %s, type: %d\n", name, type)); WL_DBG(("if name: %s, type: %d\n", name, type));
switch (type) { switch (type) {
case NL80211_IFTYPE_ADHOC: case NL80211_IFTYPE_ADHOC:
@@ -845,7 +847,11 @@ wl_cfg80211_add_virtual_iface(struct wiphy *wiphy, char *name,
/* wait till IF_DEL is complete /* wait till IF_DEL is complete
* release the lock for the unregister to proceed * release the lock for the unregister to proceed
*/ */
/* put back the rtnl_lock again */
if (rtnl_is_locked()) {
rtnl_unlock(); rtnl_unlock();
rollback_lock = true;
}
WL_INFO(("%s: Released the lock and wait till IF_DEL is complete\n", WL_INFO(("%s: Released the lock and wait till IF_DEL is complete\n",
__func__)); __func__));
timeout = wait_event_interruptible_timeout(wl->dongle_event_wait, timeout = wait_event_interruptible_timeout(wl->dongle_event_wait,
@@ -853,7 +859,10 @@ wl_cfg80211_add_virtual_iface(struct wiphy *wiphy, char *name,
msecs_to_jiffies(MAX_WAIT_TIME)); msecs_to_jiffies(MAX_WAIT_TIME));
/* put back the rtnl_lock again */ /* put back the rtnl_lock again */
if (rollback_lock) {
rtnl_lock(); rtnl_lock();
rollback_lock = false;
}
if (timeout > 0) { if (timeout > 0) {
WL_ERR(("IF DEL is Success\n")); WL_ERR(("IF DEL is Success\n"));
@@ -911,14 +920,22 @@ wl_cfg80211_add_virtual_iface(struct wiphy *wiphy, char *name,
wl->p2p->vif_created = true; wl->p2p->vif_created = true;
set_mode_by_netdev(wl, _ndev, mode); set_mode_by_netdev(wl, _ndev, mode);
net_attach = wl_to_p2p_bss_private(wl, P2PAPI_BSSCFG_CONNECTION); net_attach = wl_to_p2p_bss_private(wl, P2PAPI_BSSCFG_CONNECTION);
/* put back the rtnl_lock again */
if (rtnl_is_locked()) {
rtnl_unlock(); rtnl_unlock();
rollback_lock = true;
}
if (net_attach && !net_attach(dhd, _ndev->ifindex)) if (net_attach && !net_attach(dhd, _ndev->ifindex))
WL_DBG((" virtual interface(%s) is " WL_DBG((" virtual interface(%s) is "
"created net attach done\n", wl->p2p->vir_ifname)); "created net attach done\n", wl->p2p->vir_ifname));
else { else {
/* put back the rtnl_lock again */
if (rollback_lock)
rtnl_lock(); rtnl_lock();
goto fail; goto fail;
} }
/* put back the rtnl_lock again */
if (rollback_lock)
rtnl_lock(); rtnl_lock();
return _ndev; return _ndev;
@@ -1811,6 +1828,7 @@ wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_ssid ssid; struct cfg80211_ssid ssid;
s32 scan_retry = 0; s32 scan_retry = 0;
s32 err = 0; s32 err = 0;
bool rollback_lock = false;
WL_TRACE(("In\n")); WL_TRACE(("In\n"));
CHECK_SYS_UP(wl); CHECK_SYS_UP(wl);
@@ -1832,10 +1850,14 @@ wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
} }
} while (++scan_retry < WL_SCAN_RETRY_MAX); } while (++scan_retry < WL_SCAN_RETRY_MAX);
/* to allow scan_inform to propagate to cfg80211 plane */ /* to allow scan_inform to propagate to cfg80211 plane */
if (rtnl_is_locked()) {
rtnl_unlock(); rtnl_unlock();
rollback_lock = true;
}
/* wait 4 secons till scan done.... */ /* wait 4 secons till scan done.... */
schedule_timeout_interruptible(4 * HZ); schedule_timeout_interruptible(4 * HZ);
if (rollback_lock)
rtnl_lock(); rtnl_lock();
bss = cfg80211_get_ibss(wiphy, NULL, bss = cfg80211_get_ibss(wiphy, NULL,
params->ssid, params->ssid_len); params->ssid, params->ssid_len);
@@ -4573,7 +4595,7 @@ static s32 wl_update_bss_info(struct wl_priv *wl, struct net_device *ndev)
ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS,
WLAN_CAPABILITY_ESS); WLAN_CAPABILITY_ESS);
rtnl_lock(); mutex_lock(&wl->usr_sync);
if (unlikely(!bss)) { if (unlikely(!bss)) {
WL_DBG(("Could not find the AP\n")); WL_DBG(("Could not find the AP\n"));
*(u32 *) wl->extra_buf = htod32(WL_EXTRA_BUF_MAX); *(u32 *) wl->extra_buf = htod32(WL_EXTRA_BUF_MAX);
@@ -4624,7 +4646,7 @@ static s32 wl_update_bss_info(struct wl_priv *wl, struct net_device *ndev)
wl_update_prof(wl, NULL, &dtim_period, WL_PROF_DTIMPERIOD); wl_update_prof(wl, NULL, &dtim_period, WL_PROF_DTIMPERIOD);
update_bss_info_out: update_bss_info_out:
rtnl_unlock(); mutex_unlock(&wl->usr_sync);
return err; return err;
} }
@@ -4696,7 +4718,7 @@ wl_notify_mic_status(struct wl_priv *wl, struct net_device *ndev,
u16 flags = ntoh16(e->flags); u16 flags = ntoh16(e->flags);
enum nl80211_key_type key_type; enum nl80211_key_type key_type;
rtnl_lock(); mutex_lock(&wl->usr_sync);
if (flags & WLC_EVENT_MSG_GROUP) if (flags & WLC_EVENT_MSG_GROUP)
key_type = NL80211_KEYTYPE_GROUP; key_type = NL80211_KEYTYPE_GROUP;
else else
@@ -4704,7 +4726,7 @@ wl_notify_mic_status(struct wl_priv *wl, struct net_device *ndev,
cfg80211_michael_mic_failure(ndev, (u8 *)&e->addr, key_type, -1, cfg80211_michael_mic_failure(ndev, (u8 *)&e->addr, key_type, -1,
NULL, GFP_KERNEL); NULL, GFP_KERNEL);
rtnl_unlock(); mutex_unlock(&wl->usr_sync);
return 0; return 0;
} }
@@ -4723,8 +4745,8 @@ wl_notify_scan_status(struct wl_priv *wl, struct net_device *ndev,
if (wl->iscan_on && wl->iscan_kickstart) if (wl->iscan_on && wl->iscan_kickstart)
return wl_wakeup_iscan(wl_to_iscan(wl)); return wl_wakeup_iscan(wl_to_iscan(wl));
mutex_lock(&wl->usr_sync);
wl_clr_drv_status(wl, SCANNING); wl_clr_drv_status(wl, SCANNING);
rtnl_lock();
err = wldev_ioctl(ndev, WLC_GET_CHANNEL, &channel_inform, err = wldev_ioctl(ndev, WLC_GET_CHANNEL, &channel_inform,
sizeof(channel_inform), false); sizeof(channel_inform), false);
if (unlikely(err)) { if (unlikely(err)) {
@@ -4762,7 +4784,7 @@ scan_done_out:
wl->scan_request = NULL; wl->scan_request = NULL;
} }
dhd_os_spin_unlock((dhd_pub_t *)(wl->pub), flags); dhd_os_spin_unlock((dhd_pub_t *)(wl->pub), flags);
rtnl_unlock(); mutex_unlock(&wl->usr_sync);
return err; return err;
} }
static s32 static s32
@@ -5132,10 +5154,10 @@ static s32 wl_iscan_done(struct wl_priv *wl)
s32 err = 0; s32 err = 0;
iscan->state = WL_ISCAN_STATE_IDLE; iscan->state = WL_ISCAN_STATE_IDLE;
rtnl_lock(); mutex_lock(&wl->usr_sync);
wl_inform_bss(wl); wl_inform_bss(wl);
wl_notify_iscan_complete(iscan, false); wl_notify_iscan_complete(iscan, false);
rtnl_unlock(); mutex_unlock(&wl->usr_sync);
return err; return err;
} }
@@ -5157,10 +5179,10 @@ static s32 wl_iscan_inprogress(struct wl_priv *wl)
struct wl_iscan_ctrl *iscan = wl->iscan; struct wl_iscan_ctrl *iscan = wl->iscan;
s32 err = 0; s32 err = 0;
rtnl_lock(); mutex_lock(&wl->usr_sync);
wl_inform_bss(wl); wl_inform_bss(wl);
wl_run_iscan(iscan, NULL, WL_SCAN_ACTION_CONTINUE); wl_run_iscan(iscan, NULL, WL_SCAN_ACTION_CONTINUE);
rtnl_unlock(); mutex_unlock(&wl->usr_sync);
/* Reschedule the timer */ /* Reschedule the timer */
mod_timer(&iscan->timer, jiffies + iscan->timer_ms * HZ / 1000); mod_timer(&iscan->timer, jiffies + iscan->timer_ms * HZ / 1000);
iscan->timer_on = 1; iscan->timer_on = 1;
@@ -5174,9 +5196,9 @@ static s32 wl_iscan_aborted(struct wl_priv *wl)
s32 err = 0; s32 err = 0;
iscan->state = WL_ISCAN_STATE_IDLE; iscan->state = WL_ISCAN_STATE_IDLE;
rtnl_lock(); mutex_lock(&wl->usr_sync);
wl_notify_iscan_complete(iscan, true); wl_notify_iscan_complete(iscan, true);
rtnl_unlock(); mutex_unlock(&wl->usr_sync);
return err; return err;
} }
@@ -5199,13 +5221,13 @@ static s32 wl_iscan_thread(void *data)
del_timer_sync(&iscan->timer); del_timer_sync(&iscan->timer);
iscan->timer_on = 0; iscan->timer_on = 0;
} }
rtnl_lock(); mutex_lock(&wl->usr_sync);
err = wl_get_iscan_results(iscan, &status, &wl->bss_list); err = wl_get_iscan_results(iscan, &status, &wl->bss_list);
if (unlikely(err)) { if (unlikely(err)) {
status = WL_SCAN_RESULTS_ABORTED; status = WL_SCAN_RESULTS_ABORTED;
WL_ERR(("Abort iscan\n")); WL_ERR(("Abort iscan\n"));
} }
rtnl_unlock(); mutex_unlock(&wl->usr_sync);
iscan->iscan_handler[status] (wl); iscan->iscan_handler[status] (wl);
} }
if (iscan->timer_on) { if (iscan->timer_on) {
@@ -5366,37 +5388,37 @@ static s32 wl_escan_handler(struct wl_priv *wl,
else if (status == WLC_E_STATUS_SUCCESS) { else if (status == WLC_E_STATUS_SUCCESS) {
wl->escan_info.escan_state = WL_ESCAN_STATE_IDLE; wl->escan_info.escan_state = WL_ESCAN_STATE_IDLE;
if (likely(wl->scan_request)) { if (likely(wl->scan_request)) {
rtnl_lock(); mutex_lock(&wl->usr_sync);
del_timer_sync(&wl->scan_timeout); del_timer_sync(&wl->scan_timeout);
WL_INFO(("ESCAN COMPLETED\n")); WL_INFO(("ESCAN COMPLETED\n"));
wl->bss_list = (wl_scan_results_t *)wl->escan_info.escan_buf; wl->bss_list = (wl_scan_results_t *)wl->escan_info.escan_buf;
wl_inform_bss(wl); wl_inform_bss(wl);
wl_notify_escan_complete(wl, false); wl_notify_escan_complete(wl, false);
rtnl_unlock(); mutex_unlock(&wl->usr_sync);
} }
} }
else if (status == WLC_E_STATUS_ABORT) { else if (status == WLC_E_STATUS_ABORT) {
wl->escan_info.escan_state = WL_ESCAN_STATE_IDLE; wl->escan_info.escan_state = WL_ESCAN_STATE_IDLE;
if (likely(wl->scan_request)) { if (likely(wl->scan_request)) {
rtnl_lock(); mutex_lock(&wl->usr_sync);
del_timer_sync(&wl->scan_timeout); del_timer_sync(&wl->scan_timeout);
WL_INFO(("ESCAN ABORTED\n")); WL_INFO(("ESCAN ABORTED\n"));
wl->bss_list = (wl_scan_results_t *)wl->escan_info.escan_buf; wl->bss_list = (wl_scan_results_t *)wl->escan_info.escan_buf;
wl_inform_bss(wl); wl_inform_bss(wl);
wl_notify_escan_complete(wl, true); wl_notify_escan_complete(wl, true);
rtnl_unlock(); mutex_unlock(&wl->usr_sync);
} }
} }
else { else {
WL_ERR(("unexpected Escan Event %d : abort\n", status)); WL_ERR(("unexpected Escan Event %d : abort\n", status));
wl->escan_info.escan_state = WL_ESCAN_STATE_IDLE; wl->escan_info.escan_state = WL_ESCAN_STATE_IDLE;
if (likely(wl->scan_request)) { if (likely(wl->scan_request)) {
rtnl_lock(); mutex_lock(&wl->usr_sync);
del_timer_sync(&wl->scan_timeout); del_timer_sync(&wl->scan_timeout);
wl->bss_list = (wl_scan_results_t *)wl->escan_info.escan_buf; wl->bss_list = (wl_scan_results_t *)wl->escan_info.escan_buf;
wl_inform_bss(wl); wl_inform_bss(wl);
wl_notify_escan_complete(wl, true); wl_notify_escan_complete(wl, true);
rtnl_unlock(); mutex_unlock(&wl->usr_sync);
} }
} }
exit: exit:
@@ -6988,10 +7010,6 @@ wl_cfg80211_bt_setflag(struct net_device *dev, bool set)
char buf_flag7_default[8] = { 7, 00, 00, 00, 0x0, 0x00, 0x00, 0x00}; char buf_flag7_default[8] = { 7, 00, 00, 00, 0x0, 0x00, 0x00, 0x00};
#endif #endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
rtnl_lock();
#endif
#if defined(BT_DHCP_eSCO_FIX) #if defined(BT_DHCP_eSCO_FIX)
/* set = 1, save & turn on 0 - off & restore prev settings */ /* set = 1, save & turn on 0 - off & restore prev settings */
set_btc_esco_params(dev, set); set_btc_esco_params(dev, set);
@@ -7010,10 +7028,6 @@ wl_cfg80211_bt_setflag(struct net_device *dev, bool set)
(char *)&buf_flag7_default[0], (char *)&buf_flag7_default[0],
sizeof(buf_flag7_default)); sizeof(buf_flag7_default));
#endif #endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27))
rtnl_unlock();
#endif
} }
static void wl_cfg80211_bt_timerfunc(ulong data) static void wl_cfg80211_bt_timerfunc(ulong data)