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

Commit ff95fe38 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 eb85569f 4885c873

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

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ ath5k_hw_radio_revision(struct ath5k_hw *ah, enum ieee80211_band band) 
		ath5k_hw_reg_write(ah, 0x00010000, AR5K_PHY(0x20));



	if (ah->ah_version == AR5K_AR5210) {

		srev = ath5k_hw_reg_read(ah, AR5K_PHY(256) >> 28) & 0xf;

		srev = (ath5k_hw_reg_read(ah, AR5K_PHY(256)) >> 28) & 0xf;

		ret = (u16)ath5k_hw_bitswap(srev, 4) + 1;

	} else {

		srev = (ath5k_hw_reg_read(ah, AR5K_PHY(0x100)) >> 24) & 0xff;

drivers/net/wireless/hostap/hostap_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ void hostap_init_proc(local_info_t *local) 


void hostap_remove_proc(local_info_t *local)

{

	remove_proc_subtree(local->ddev->name, hostap_proc);

	proc_remove(local->proc);

}

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+20 −2
Original line number Diff line number Diff line
@@ -696,6 +696,24 @@ static int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
	return ret;

}



static inline bool iwl_enable_rx_ampdu(const struct iwl_cfg *cfg)

{

	if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_RXAGG)

		return false;

	return true;

}



static inline bool iwl_enable_tx_ampdu(const struct iwl_cfg *cfg)

{

	if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_TXAGG)

		return false;

	if (iwlwifi_mod_params.disable_11n & IWL_ENABLE_HT_TXAGG)

		return true;



	/* disabled by default */

	return false;

}



static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,

				   struct ieee80211_vif *vif,

				   enum ieee80211_ampdu_mlme_action action,
@@ -717,7 +735,7 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw, 


	switch (action) {

	case IEEE80211_AMPDU_RX_START:

		if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_RXAGG)

		if (!iwl_enable_rx_ampdu(priv->cfg))

			break;

		IWL_DEBUG_HT(priv, "start Rx\n");

		ret = iwl_sta_rx_agg_start(priv, sta, tid, *ssn);
@@ -729,7 +747,7 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw, 
	case IEEE80211_AMPDU_TX_START:

		if (!priv->trans->ops->txq_enable)

			break;

		if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_TXAGG)

		if (!iwl_enable_tx_ampdu(priv->cfg))

			break;

		IWL_DEBUG_HT(priv, "start Tx\n");

		ret = iwlagn_tx_agg_start(priv, vif, sta, tid, ssn);

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

+1 −1
Original line number Diff line number Diff line
@@ -1286,7 +1286,7 @@ module_param_named(swcrypto, iwlwifi_mod_params.sw_crypto, int, S_IRUGO); 
MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])");

module_param_named(11n_disable, iwlwifi_mod_params.disable_11n, uint, S_IRUGO);

MODULE_PARM_DESC(11n_disable,

	"disable 11n functionality, bitmap: 1: full, 2: agg TX, 4: agg RX");

	"disable 11n functionality, bitmap: 1: full, 2: disable agg TX, 4: disable agg RX, 8 enable agg TX");

module_param_named(amsdu_size_8K, iwlwifi_mod_params.amsdu_size_8K,

		   int, S_IRUGO);

MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size (default 0)");

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

+7 −4
Original line number Diff line number Diff line
@@ -79,9 +79,12 @@ enum iwl_power_level { 
	IWL_POWER_NUM

};



#define IWL_DISABLE_HT_ALL	BIT(0)

#define IWL_DISABLE_HT_TXAGG	BIT(1)

#define IWL_DISABLE_HT_RXAGG	BIT(2)

enum iwl_disable_11n {

	IWL_DISABLE_HT_ALL	 = BIT(0),

	IWL_DISABLE_HT_TXAGG	 = BIT(1),

	IWL_DISABLE_HT_RXAGG	 = BIT(2),

	IWL_ENABLE_HT_TXAGG	 = BIT(3),

};



/**

 * struct iwl_mod_params
@@ -90,7 +93,7 @@ enum iwl_power_level { 
 *

 * @sw_crypto: using hardware encryption, default = 0

 * @disable_11n: disable 11n capabilities, default = 0,

 *	use IWL_DISABLE_HT_* constants

 *	use IWL_[DIS,EN]ABLE_HT_* constants

 * @amsdu_size_8K: enable 8K amsdu size, default = 0

 * @restart_fw: restart firmware, default = 1

 * @wd_disable: enable stuck queue check, default = 0