diff --git a/[refs] b/[refs] index a37e73e8b925..54304e9b9c09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b84206ee7e53f496e0e3ab2d57731a983996da83 +refs/heads/master: 96bd55bd67de2dddb1d917b7631e23b86a8b1cd4 diff --git a/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac_wx.c b/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac_wx.c index 1bbd49f1d6f6..1ce3df28f637 100644 --- a/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac_wx.c +++ b/trunk/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/trunk/drivers/staging/rtl8192e/r8192E_core.c b/trunk/drivers/staging/rtl8192e/r8192E_core.c index eb41402d1d37..ef0adad2e589 100644 --- a/trunk/drivers/staging/rtl8192e/r8192E_core.c +++ b/trunk/drivers/staging/rtl8192e/r8192E_core.c @@ -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{