Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfa6cb20 authored by John W. Linville's avatar John W. Linville
Browse files

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

Conflicts:
	net/mac80211/scan.c
	net/mac80211/wme.c
parents 8271195e 8a5b33f5

net/mac80211/iface.c

+2 −2
Original line number Diff line number Diff line
@@ -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.

net/mac80211/mlme.c

+2 −2
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata, 
	ieee80211_recalc_smps(local, sdata);

	mutex_unlock(&local->iflist_mtx);



	netif_start_queue(sdata->dev);

	netif_tx_start_all_queues(sdata->dev);

	netif_carrier_on(sdata->dev);

}
@@ -759,7 +759,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata) 
	 * time -- we don't want the scan code to enable queues.

	 */



	netif_stop_queue(sdata->dev);

	netif_tx_stop_all_queues(sdata->dev);

	netif_carrier_off(sdata->dev);



	rcu_read_lock();

net/mac80211/offchannel.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */