Commit 96bd55bd authored by Samuel Ortiz's avatar Samuel Ortiz Committed by Greg Kroah-Hartman

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: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b84206ee
...@@ -337,8 +337,6 @@ void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee) ...@@ -337,8 +337,6 @@ void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee)
ieee80211_sta_ps_send_null_frame(ieee, 1); ieee80211_sta_ps_send_null_frame(ieee, 1);
#endif #endif
netif_carrier_off(ieee->dev);
if (ieee->data_hard_stop) if (ieee->data_hard_stop)
ieee->data_hard_stop(ieee->dev); ieee->data_hard_stop(ieee->dev);
...@@ -389,7 +387,6 @@ void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee) ...@@ -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) if(ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode == IW_MODE_MASTER)
ieee80211_start_send_beacons(ieee); ieee80211_start_send_beacons(ieee);
netif_carrier_on(ieee->dev);
count = 0; count = 0;
up(&ieee->wx_sem); up(&ieee->wx_sem);
......
...@@ -4318,7 +4318,6 @@ static void rtl819x_ifsilentreset(struct net_device *dev) ...@@ -4318,7 +4318,6 @@ static void rtl819x_ifsilentreset(struct net_device *dev)
del_timer_sync(&ieee->associate_timer); del_timer_sync(&ieee->associate_timer);
cancel_delayed_work(&ieee->associate_retry_wq); cancel_delayed_work(&ieee->associate_retry_wq);
ieee80211_stop_scan(ieee); ieee80211_stop_scan(ieee);
netif_carrier_off(dev);
up(&ieee->wx_sem); up(&ieee->wx_sem);
} }
else{ else{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment