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

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

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/libertas/cfg.c
parents ba5736a5 9995ffe5

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1967,6 +1967,7 @@ static void ath9k_set_power_sleep(struct ath_hw *ah, int setChip) 
	}

	}





	/* Clear Bit 14 of AR_WA after putting chip into Full Sleep mode. */

	/* Clear Bit 14 of AR_WA after putting chip into Full Sleep mode. */

	if (AR_SREV_9300_20_OR_LATER(ah))

		REG_WRITE(ah, AR_WA, ah->WARegVal & ~AR_WA_D3_L1_DISABLE);

		REG_WRITE(ah, AR_WA, ah->WARegVal & ~AR_WA_D3_L1_DISABLE);

}

}

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -182,6 +182,7 @@ static struct iwl_base_params iwl1000_base_params = { 
	.chain_noise_scale = 1000,

	.chain_noise_scale = 1000,

	.wd_timeout = IWL_DEF_WD_TIMEOUT,

	.wd_timeout = IWL_DEF_WD_TIMEOUT,

	.max_event_log_size = 128,

	.max_event_log_size = 128,

	.wd_disable = true,

};

};

static struct iwl_ht_params iwl1000_ht_params = {

static struct iwl_ht_params iwl1000_ht_params = {

	.ht_greenfield_support = true,

	.ht_greenfield_support = true,

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -350,6 +350,7 @@ static struct iwl_base_params iwl5000_base_params = { 
	.wd_timeout = IWL_LONG_WD_TIMEOUT,

	.wd_timeout = IWL_LONG_WD_TIMEOUT,

	.max_event_log_size = 512,

	.max_event_log_size = 512,

	.no_idle_support = true,

	.no_idle_support = true,

	.wd_disable = true,

};

};

static struct iwl_ht_params iwl5000_ht_params = {

static struct iwl_ht_params iwl5000_ht_params = {

	.ht_greenfield_support = true,

	.ht_greenfield_support = true,

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

+23 −13
Original line number Original line Diff line number Diff line
@@ -529,6 +529,24 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) 
	return 0;

	return 0;

}

}





void iwlagn_config_ht40(struct ieee80211_conf *conf,

	struct iwl_rxon_context *ctx)

{

	if (conf_is_ht40_minus(conf)) {

		ctx->ht.extension_chan_offset =

			IEEE80211_HT_PARAM_CHA_SEC_BELOW;

		ctx->ht.is_40mhz = true;

	} else if (conf_is_ht40_plus(conf)) {

		ctx->ht.extension_chan_offset =

			IEEE80211_HT_PARAM_CHA_SEC_ABOVE;

		ctx->ht.is_40mhz = true;

	} else {

		ctx->ht.extension_chan_offset =

			IEEE80211_HT_PARAM_CHA_SEC_NONE;

		ctx->ht.is_40mhz = false;

	}

}



int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)

int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)

{

{

	struct iwl_priv *priv = hw->priv;

	struct iwl_priv *priv = hw->priv;
@@ -590,19 +608,11 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed) 
				ctx->ht.enabled = conf_is_ht(conf);

				ctx->ht.enabled = conf_is_ht(conf);





			if (ctx->ht.enabled) {

			if (ctx->ht.enabled) {

				if (conf_is_ht40_minus(conf)) {

				/* if HT40 is used, it should not change

					ctx->ht.extension_chan_offset =

				 * after associated except channel switch */

						IEEE80211_HT_PARAM_CHA_SEC_BELOW;

				if (iwl_is_associated_ctx(ctx) &&

					ctx->ht.is_40mhz = true;

				     !ctx->ht.is_40mhz)

				} else if (conf_is_ht40_plus(conf)) {

					iwlagn_config_ht40(conf, ctx);

					ctx->ht.extension_chan_offset =

						IEEE80211_HT_PARAM_CHA_SEC_ABOVE;

					ctx->ht.is_40mhz = true;

				} else {

					ctx->ht.extension_chan_offset =

						IEEE80211_HT_PARAM_CHA_SEC_NONE;

					ctx->ht.is_40mhz = false;

				}

			} else

			} else

				ctx->ht.is_40mhz = false;

				ctx->ht.is_40mhz = false;

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

+0 −5
Original line number Original line Diff line number Diff line
@@ -1250,9 +1250,6 @@ int iwl_set_dynamic_key(struct iwl_priv *priv, 




	switch (keyconf->cipher) {

	switch (keyconf->cipher) {

	case WLAN_CIPHER_SUITE_TKIP:

	case WLAN_CIPHER_SUITE_TKIP:

		keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;

		keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;



		if (sta)

		if (sta)

			addr = sta->addr;

			addr = sta->addr;

		else /* station mode case only */

		else /* station mode case only */
@@ -1265,8 +1262,6 @@ int iwl_set_dynamic_key(struct iwl_priv *priv, 
					  seq.tkip.iv32, p1k, CMD_SYNC);

					  seq.tkip.iv32, p1k, CMD_SYNC);

		break;

		break;

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_CCMP:

		keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;

		/* fall through */

	case WLAN_CIPHER_SUITE_WEP40:

	case WLAN_CIPHER_SUITE_WEP40:

	case WLAN_CIPHER_SUITE_WEP104:

	case WLAN_CIPHER_SUITE_WEP104:

		ret = iwlagn_send_sta_key(priv, keyconf, sta_id,

		ret = iwlagn_send_sta_key(priv, keyconf, sta_id,