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

Commit 54a4fe54 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents ef352e7c d78f4b3e

drivers/net/wireless/ath/ath9k/main.c

+2 −0
Original line number Diff line number Diff line
@@ -2160,6 +2160,8 @@ static void ath9k_flush(struct ieee80211_hw *hw, bool drop) 
	if (!ath_drain_all_txq(sc, false))

		ath_reset(sc, false);



	ieee80211_wake_queues(hw);



out:

	ieee80211_queue_delayed_work(hw, &sc->tx_complete_work, 0);

	mutex_unlock(&sc->mutex);

drivers/net/wireless/ath/ath9k/rc.c

+1 −1
Original line number Diff line number Diff line
@@ -1328,7 +1328,7 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband, 


	hdr = (struct ieee80211_hdr *)skb->data;

	fc = hdr->frame_control;

	for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {

	for (i = 0; i < sc->hw->max_rates; i++) {

		struct ieee80211_tx_rate *rate = &tx_info->status.rates[i];

		if (!rate->count)

			break;

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -2265,7 +2265,7 @@ signed long iwlagn_wait_notification(struct iwl_priv *priv, 
	int ret;



	ret = wait_event_timeout(priv->_agn.notif_waitq,

				 &wait_entry->triggered,

				 wait_entry->triggered,

				 timeout);



	spin_lock_bh(&priv->_agn.notif_wait_lock);

drivers/net/wireless/orinoco/cfg.c

+3 −0
Original line number Diff line number Diff line
@@ -153,6 +153,9 @@ static int orinoco_scan(struct wiphy *wiphy, struct net_device *dev, 
	priv->scan_request = request;



	err = orinoco_hw_trigger_scan(priv, request->ssids);

	/* On error the we aren't processing the request */

	if (err)

		priv->scan_request = NULL;



	return err;

}