xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Förgrening 0
Kod Ärenden Pull-förfrågningar Actions Packages Projekt Släpp Wiki Aktiviteter

Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Bläddra i källkod 
Conflicts:
	net/mac80211/scan.c
	net/mac80211/wme.c
This commit is contained in:
John W. Linville
2010-01-06 17:22:54 -05:00
förälder 8271195e38 8a5b33f554
incheckning cfa6cb2048
3 ändrade filer med 7 tillägg och 7 borttagningar
Download Patch File Download Diff File Expand all files Collapse all files

6
net/mac80211/offchannel.c
Visa fil

@@ -113,7 +113,7 @@ void ieee80211_offchannel_stop_beaconing(struct ieee80211_local *local)
*/
if (sdata->vif.type != NL80211_IFTYPE_STATION &&
sdata->vif.type != NL80211_IFTYPE_MONITOR)
netif_stop_queue(sdata->dev);
netif_tx_stop_all_queues(sdata->dev);
}
mutex_unlock(&local->iflist_mtx);
}
@@ -131,7 +131,7 @@ void ieee80211_offchannel_stop_station(struct ieee80211_local *local)
continue;
if (sdata->vif.type == NL80211_IFTYPE_STATION) {
netif_stop_queue(sdata->dev);
netif_tx_stop_all_queues(sdata->dev);
if (sdata->u.mgd.associated)
ieee80211_offchannel_ps_enable(sdata);
}
@@ -153,7 +153,7 @@ void ieee80211_offchannel_return(struct ieee80211_local *local,
if (sdata->vif.type == NL80211_IFTYPE_STATION) {
if (sdata->u.mgd.associated)
ieee80211_offchannel_ps_disable(sdata);
netif_wake_queue(sdata->dev);
netif_tx_wake_all_queues(sdata->dev);
}
/* re-enable beaconing */