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

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
parents 9684d7b0 d107babc

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

+11 −12
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) 
	struct ath_hw *ah = sc->sc_ah;

	struct ath_common *common = ath9k_hw_common(ah);

	unsigned long flags;

	int i;



	if (ath_startrecv(sc) != 0) {

		ath_err(common, "Unable to restart recv logic\n");
@@ -235,6 +236,15 @@ static bool ath_complete_reset(struct ath_softc *sc, bool start) 
		}

	work:

		ath_restart_work(sc);



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

			if (!ATH_TXQ_SETUP(sc, i))

				continue;



			spin_lock_bh(&sc->tx.txq[i].axq_lock);

			ath_txq_schedule(sc, &sc->tx.txq[i]);

			spin_unlock_bh(&sc->tx.txq[i].axq_lock);

		}

	}



	ieee80211_wake_queues(sc->hw);
@@ -539,21 +549,10 @@ irqreturn_t ath_isr(int irq, void *dev) 


static int ath_reset(struct ath_softc *sc)

{

	int i, r;

	int r;



	ath9k_ps_wakeup(sc);



	r = ath_reset_internal(sc, NULL);



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

		if (!ATH_TXQ_SETUP(sc, i))

			continue;



		spin_lock_bh(&sc->tx.txq[i].axq_lock);

		ath_txq_schedule(sc, &sc->tx.txq[i]);

		spin_unlock_bh(&sc->tx.txq[i].axq_lock);

	}



	ath9k_ps_restore(sc);



	return r;

drivers/net/wireless/iwlwifi/iwl-6000.c

+6 −0
Original line number Diff line number Diff line
@@ -240,6 +240,12 @@ const struct iwl_cfg iwl6035_2agn_cfg = { 
	.ht_params = &iwl6000_ht_params,

};



const struct iwl_cfg iwl6035_2agn_sff_cfg = {

	.name = "Intel(R) Centrino(R) Ultimate-N 6235 AGN",

	IWL_DEVICE_6035,

	.ht_params = &iwl6000_ht_params,

};



const struct iwl_cfg iwl1030_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1030 BGN",

	IWL_DEVICE_6030,

drivers/net/wireless/iwlwifi/iwl-config.h

+1 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ extern const struct iwl_cfg iwl2000_2bgn_cfg; 
extern const struct iwl_cfg iwl2000_2bgn_d_cfg;

extern const struct iwl_cfg iwl2030_2bgn_cfg;

extern const struct iwl_cfg iwl6035_2agn_cfg;

extern const struct iwl_cfg iwl6035_2agn_sff_cfg;

extern const struct iwl_cfg iwl105_bgn_cfg;

extern const struct iwl_cfg iwl105_bgn_d_cfg;

extern const struct iwl_cfg iwl135_bgn_cfg;

drivers/net/wireless/iwlwifi/iwl-trans.h

+4 −2
Original line number Diff line number Diff line
@@ -601,8 +601,10 @@ static inline int iwl_trans_send_cmd(struct iwl_trans *trans, 
{

	int ret;



	WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE,

		  "%s bad state = %d", __func__, trans->state);

	if (trans->state != IWL_TRANS_FW_ALIVE) {

		IWL_ERR(trans, "%s bad state = %d", __func__, trans->state);

		return -EIO;

	}



	if (!(cmd->flags & CMD_ASYNC))

		lock_map_acquire_read(&trans->sync_cmd_lockdep_map);

drivers/net/wireless/iwlwifi/mvm/power.c

+4 −1
Original line number Diff line number Diff line
@@ -273,7 +273,10 @@ static void iwl_mvm_power_build_cmd(struct iwl_mvm *mvm, 
		if (!mvmvif->queue_params[ac].uapsd)

			continue;



		cmd->flags |= cpu_to_le16(POWER_FLAGS_ADVANCE_PM_ENA_MSK);

		if (mvm->cur_ucode != IWL_UCODE_WOWLAN)

			cmd->flags |=

				cpu_to_le16(POWER_FLAGS_ADVANCE_PM_ENA_MSK);



		cmd->uapsd_ac_flags |= BIT(ac);



		/* QNDP TID - the highest TID with no admission control */