diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2010-06-10 16:54:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-22 14:46:19 -0700 |
| commit | 96bd55bd67de2dddb1d917b7631e23b86a8b1cd4 (patch) | |
| tree | 638e072e2fe24a5860cc74b36583909335395714 /drivers/staging/rtl8192e | |
| parent | b84206ee7e53f496e0e3ab2d57731a983996da83 (diff) | |
| download | op-kernel-dev-96bd55bd67de2dddb1d917b7631e23b86a8b1cd4.zip op-kernel-dev-96bd55bd67de2dddb1d917b7631e23b86a8b1cd4.tar.gz | |
Staging: rtl8192e: Do not mess with carrier settings while scanning
Toggling the link carrier is a non sense and is the grossest locking I can
think of. Moreover, it's giving a completely inaccurate status to userspace
who could for example decide to turn the interface down on carrier off
detection.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e')
| -rw-r--r-- | drivers/staging/rtl8192e/ieee80211/ieee80211_softmac_wx.c | 3 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/r8192E_core.c | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac_wx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac_wx.c index 1bbd49f..1ce3df2 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac_wx.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac_wx.c @@ -337,8 +337,6 @@ void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee) ieee80211_sta_ps_send_null_frame(ieee, 1); #endif - netif_carrier_off(ieee->dev); - if (ieee->data_hard_stop) ieee->data_hard_stop(ieee->dev); @@ -389,7 +387,6 @@ void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee) if(ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode == IW_MODE_MASTER) ieee80211_start_send_beacons(ieee); - netif_carrier_on(ieee->dev); count = 0; up(&ieee->wx_sem); diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index eb41402..ef0adad 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -4318,7 +4318,6 @@ RESET_START: del_timer_sync(&ieee->associate_timer); cancel_delayed_work(&ieee->associate_retry_wq); ieee80211_stop_scan(ieee); - netif_carrier_off(dev); up(&ieee->wx_sem); } else{ |
