Skip to content

Commit

Permalink
Staging: rtl8192e: Do not mess with carrier settings while scanning
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Samuel Ortiz authored and Greg Kroah-Hartman committed Jun 22, 2010
1 parent b84206e commit 96bd55b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 4 deletions.
3 changes: 0 additions & 3 deletions drivers/staging/rtl8192e/ieee80211/ieee80211_softmac_wx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down
1 change: 0 additions & 1 deletion drivers/staging/rtl8192e/r8192E_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -4318,7 +4318,6 @@ static void rtl819x_ifsilentreset(struct net_device *dev)
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{
Expand Down

0 comments on commit 96bd55b

Please sign in to comment.