Staging: rtl8187se: 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/rtl8187se/ieee80211/ieee80211_softmac_wx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
index ad42bcdc9374ecab44ba4769d93b6b0d7da4ab0c..e46ff2ffa09b83e793af9c4ddcf0ce030fd38a2f 100644 (file)
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac_wx.c
@@ -277,8 +277,6 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work)
 
        chan = ieee->current_network.channel;
 
-       netif_carrier_off(ieee->dev);
-
        if (ieee->data_hard_stop)
                ieee->data_hard_stop(ieee->dev);
 
@@ -300,8 +298,6 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work)
        if(ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode == IW_MODE_MASTER)
                ieee80211_start_send_beacons(ieee);
 
-       netif_carrier_on(ieee->dev);
-
        //YJ,add,080828, In prevent of lossing ping packet during scanning
        //ieee80211_sta_ps_send_null_frame(ieee, false);
        //YJ,add,080828,end