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>

diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac_wx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac_wx.c
index 1bbd49f1d6f6d8f1686c1c2487ac31e6e957c0bb..1ce3df28f6378d848efb148847d6b3942aa700e8 100644 (file)
--- 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 eb41402d1d3716179e3761f5219da671b44750ee..ef0adad2e589c51e61eb192e727fa6bcbba2c6ca 100644 (file)
--- 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{