lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
parent 8271195e38 8a5b33f554
commit cfa6cb2048
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/iface.c
View File

@@ -329,7 +329,7 @@ static int ieee80211_open(struct net_device *dev)
if (sdata->vif.type == NL80211_IFTYPE_STATION)
ieee80211_queue_work(&local->hw, &sdata->u.mgd.work);
netif_start_queue(dev);
netif_tx_start_all_queues(dev);
return 0;
err_del_interface:
@@ -357,7 +357,7 @@ static int ieee80211_stop(struct net_device *dev)
/*
* Stop TX on this interface first.
*/
netif_stop_queue(dev);
netif_tx_stop_all_queues(dev);
/*
* Purge work for this interface.