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

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

Merge tag 'master-2012-10-08' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 



John W. Linville says:

====================
Here is a batch of fixes intended for 3.7...

Amitkumar Karwar provides a couple of mwifiex fixes to correctly
report some reason codes for certain connection failures.  He also
provides a fix to cleanup after a scanning failure.  Bing Zhao rounds
that out with another mwifiex scanning fix.

Daniel Golle gives us a fix for a copy/paste error in rt2x00.

Felix Fietkau brings a couple of ath9k fixes related to suspend/resume,
and a couple of fixes to prevent memory leaks in ath9k and mac80211.

Ronald Wahl sends a carl9170 fix for a sleep in softirq context.

Thomas Pedersen reorders some code to prevent drv_get_tsf from being
called while holding a spinlock, now that it can sleep.

Finally, Wei Yongjun prevents a NULL pointer dereference in the
ath5k driver.

Please let me know if there are problems!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2474542f c3e7724b

drivers/net/wireless/ath/ath5k/base.c

+2 −1
Original line number Diff line number Diff line
@@ -1804,7 +1804,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 
{

	int ret;

	struct ath5k_hw *ah = hw->priv;

	struct ath5k_vif *avf = (void *)vif->drv_priv;

	struct ath5k_vif *avf;

	struct sk_buff *skb;



	if (WARN_ON(!vif)) {
@@ -1819,6 +1819,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 
		goto out;

	}



	avf = (void *)vif->drv_priv;

	ath5k_txbuf_free_skb(ah, avf->bbuf);

	avf->bbuf->skb = skb;

	ret = ath5k_beacon_setup(ah, avf->bbuf);

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

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void ath9k_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb) 


	if (ath_tx_start(hw, skb, &txctl) != 0) {

		ath_dbg(common, XMIT, "CABQ TX failed\n");

		dev_kfree_skb_any(skb);

		ieee80211_free_txskb(hw, skb);

	}

}

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

+5 −0
Original line number Diff line number Diff line
@@ -1450,9 +1450,14 @@ static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type) 
	REG_WRITE(ah, AR_RTC_FORCE_WAKE,

		  AR_RTC_FORCE_WAKE_EN | AR_RTC_FORCE_WAKE_ON_INT);



	if (!ah->reset_power_on)

		type = ATH9K_RESET_POWER_ON;



	switch (type) {

	case ATH9K_RESET_POWER_ON:

		ret = ath9k_hw_set_reset_power_on(ah);

		if (!ret)

			ah->reset_power_on = true;

		break;

	case ATH9K_RESET_WARM:

	case ATH9K_RESET_COLD:

drivers/net/wireless/ath/ath9k/hw.h

+1 −0
Original line number Diff line number Diff line
@@ -741,6 +741,7 @@ struct ath_hw { 
	u32 rfkill_polarity;

	u32 ah_flags;



	bool reset_power_on;

	bool htc_reset_init;



	enum nl80211_iftype opmode;

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

+5 −10
Original line number Diff line number Diff line
@@ -639,8 +639,7 @@ static int ath9k_start(struct ieee80211_hw *hw) 
		ath_err(common,

			"Unable to reset hardware; reset status %d (freq %u MHz)\n",

			r, curchan->center_freq);

		spin_unlock_bh(&sc->sc_pcu_lock);

		goto mutex_unlock;

		ah->reset_power_on = false;

	}



	/* Setup our intr mask. */
@@ -665,11 +664,8 @@ static int ath9k_start(struct ieee80211_hw *hw) 
	clear_bit(SC_OP_INVALID, &sc->sc_flags);

	sc->sc_ah->is_monitoring = false;



	if (!ath_complete_reset(sc, false)) {

		r = -EIO;

		spin_unlock_bh(&sc->sc_pcu_lock);

		goto mutex_unlock;

	}

	if (!ath_complete_reset(sc, false))

		ah->reset_power_on = false;



	if (ah->led_pin >= 0) {

		ath9k_hw_cfg_output(ah, ah->led_pin,
@@ -688,12 +684,11 @@ static int ath9k_start(struct ieee80211_hw *hw) 
	if (ah->caps.pcie_lcr_extsync_en && common->bus_ops->extn_synch_en)

		common->bus_ops->extn_synch_en(common);



mutex_unlock:

	mutex_unlock(&sc->mutex);



	ath9k_ps_restore(sc);



	return r;

	return 0;

}



static void ath9k_tx(struct ieee80211_hw *hw,
@@ -770,7 +765,7 @@ static void ath9k_tx(struct ieee80211_hw *hw, 


	return;

exit:

	dev_kfree_skb_any(skb);

	ieee80211_free_txskb(hw, skb);

}



static void ath9k_stop(struct ieee80211_hw *hw)