Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (321f3b87) · Commits · e / devices / android_kernel_xiaomi_markw

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -191,6 +191,7 @@ static struct iwl_base_params iwl1000_base_params = {
		.chain_noise_scale = 1000,
		.wd_timeout = IWL_DEF_WD_TIMEOUT,
		.max_event_log_size = 128,
		.wd_disable = true,
		};
		static struct iwl_ht_params iwl1000_ht_params = {
		.ht_greenfield_support = true,

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -364,6 +364,7 @@ static struct iwl_base_params iwl5000_base_params = {
		.wd_timeout = IWL_LONG_WD_TIMEOUT,
		.max_event_log_size = 512,
		.no_idle_support = true,
		.wd_disable = true,
		};
		static struct iwl_ht_params iwl5000_ht_params = {
		.ht_greenfield_support = true,

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

+23 −13

Original line number	Diff line number	Diff line
		@@ -528,6 +528,24 @@ int iwlagn_commit_rxon(struct iwl_priv priv, struct iwl_rxon_context ctx)
		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)
		{
		struct iwl_priv *priv = hw->priv;
		@@ -586,19 +604,11 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
		ctx->ht.enabled = conf_is_ht(conf);

		if (ctx->ht.enabled) {
		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;
		}
		/* if HT40 is used, it should not change
		* after associated except channel switch */
		if (iwl_is_associated_ctx(ctx) &&
		!ctx->ht.is_40mhz)
		iwlagn_config_ht40(conf, ctx);
		} else
		ctx->ht.is_40mhz = false;

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -1268,9 +1268,6 @@ int iwl_set_dynamic_key(struct iwl_priv *priv,

		switch (keyconf->cipher) {
		case WLAN_CIPHER_SUITE_TKIP:
		keyconf->flags \|= IEEE80211_KEY_FLAG_GENERATE_MMIC;
		keyconf->flags \|= IEEE80211_KEY_FLAG_GENERATE_IV;

		if (sta)
		addr = sta->addr;
		else /* station mode case only */
		@@ -1283,8 +1280,6 @@ int iwl_set_dynamic_key(struct iwl_priv *priv,
		seq.tkip.iv32, p1k, CMD_SYNC);
		break;
		case WLAN_CIPHER_SUITE_CCMP:
		keyconf->flags \|= IEEE80211_KEY_FLAG_GENERATE_IV;
		/* fall through */
		case WLAN_CIPHER_SUITE_WEP40:
		case WLAN_CIPHER_SUITE_WEP104:
		ret = iwlagn_send_sta_key(priv, keyconf, sta_id,

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

+17 −17

Original line number	Diff line number	Diff line
		@@ -2316,6 +2316,17 @@ static int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
		return -EOPNOTSUPP;
		}

		switch (key->cipher) {
		case WLAN_CIPHER_SUITE_TKIP:
		key->flags \|= IEEE80211_KEY_FLAG_GENERATE_MMIC;
		/* fall through */
		case WLAN_CIPHER_SUITE_CCMP:
		key->flags \|= IEEE80211_KEY_FLAG_GENERATE_IV;
		break;
		default:
		break;
		}

		/*
		* We could program these keys into the hardware as well, but we
		* don't expect much multicast traffic in IBSS and having keys
		@@ -2599,21 +2610,9 @@ static void iwlagn_mac_channel_switch(struct ieee80211_hw *hw,

		/* Configure HT40 channels */
		ctx->ht.enabled = conf_is_ht(conf);
		if (ctx->ht.enabled) {
		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;
		}
		} else
		if (ctx->ht.enabled)
		iwlagn_config_ht40(conf, ctx);
		else
		ctx->ht.is_40mhz = false;

		if ((le16_to_cpu(ctx->staging.channel) != ch))
		@@ -3499,9 +3498,10 @@ MODULE_PARM_DESC(plcp_check, "Check plcp health (default: 1 [enabled])");
		module_param_named(ack_check, iwlagn_mod_params.ack_check, bool, S_IRUGO);
		MODULE_PARM_DESC(ack_check, "Check ack health (default: 0 [disabled])");

		module_param_named(wd_disable, iwlagn_mod_params.wd_disable, bool, S_IRUGO);
		module_param_named(wd_disable, iwlagn_mod_params.wd_disable, int, S_IRUGO);
		MODULE_PARM_DESC(wd_disable,
		"Disable stuck queue watchdog timer (default: 0 [enabled])");
		"Disable stuck queue watchdog timer 0=system default, "
		"1=disable, 2=enable (default: 0)");

		/*
		* set bt_coex_active to true, uCode will do kill/defer