Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (d14a7679) · Commits · e / devices / android_kernel_teracube_2e

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -2970,6 +2970,9 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
		if (modparam_nohwcrypt)
		return -EOPNOTSUPP;

		if (sc->opmode == NL80211_IFTYPE_AP)
		return -EOPNOTSUPP;

		switch (key->alg) {
		case ALG_WEP:
		case ALG_TKIP:

+12 −0

Original line number	Diff line number	Diff line
		@@ -478,6 +478,18 @@ void ath9k_ani_reset(struct ath_hw *ah)
		"Reset ANI state opmode %u\n", ah->opmode);
		ah->stats.ast_ani_reset++;

		if (ah->opmode == NL80211_IFTYPE_AP) {
		/*
		* ath9k_hw_ani_control() will only process items set on
		* ah->ani_function
		*/
		if (IS_CHAN_2GHZ(chan))
		ah->ani_function = (ATH9K_ANI_SPUR_IMMUNITY_LEVEL \|
		ATH9K_ANI_FIRSTEP_LEVEL);
		else
		ah->ani_function = 0;
		}

		ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL, 0);
		ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL, 0);
		ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL, 0);

+17 −0

Original line number	Diff line number	Diff line
		@@ -474,6 +474,21 @@ ath_regd_init_wiphy(struct ath_regulatory *reg,
		return 0;
		}

		/*
		* Some users have reported their EEPROM programmed with
		* 0x8000 set, this is not a supported regulatory domain
		* but since we have more than one user with it we need
		* a solution for them. We default to 0x64, which is the
		* default Atheros world regulatory domain.
		*/
		static void ath_regd_sanitize(struct ath_regulatory *reg)
		{
		if (reg->current_rd != COUNTRY_ERD_FLAG)
		return;
		printk(KERN_DEBUG "ath: EEPROM regdomain sanitized\n");
		reg->current_rd = 0x64;
		}

		int
		ath_regd_init(struct ath_regulatory *reg,
		struct wiphy *wiphy,
		@@ -486,6 +501,8 @@ ath_regd_init(struct ath_regulatory *reg,
		if (!reg)
		return -EINVAL;

		ath_regd_sanitize(reg);

		printk(KERN_DEBUG "ath: EEPROM regdomain: 0x%0x\n", reg->current_rd);

		if (!ath_regd_is_eeprom_valid(reg)) {

+1 −3

Original line number	Diff line number	Diff line
		@@ -2675,12 +2675,10 @@ static ssize_t show_power_level(struct device *d,
		struct device_attribute attr, char buf)
		{
		struct iwl_priv *priv = dev_get_drvdata(d);
		int mode = priv->power_data.user_power_setting;
		int level = priv->power_data.power_mode;
		char *p = buf;

		p += sprintf(p, "INDEX:%d\t", level);
		p += sprintf(p, "USER:%d\n", mode);
		p += sprintf(p, "%d\n", level);
		return p - buf + 1;
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -872,6 +872,7 @@ int iwl_tx_skb(struct iwl_priv priv, struct sk_buff skb)
		iwl_print_hex_dump(priv, IWL_DL_TX, (u8 *)tx_cmd->hdr, hdr_len);

		/* Set up entry for this TFD in Tx byte-count array */
		if (info->flags & IEEE80211_TX_CTL_AMPDU)
		priv->cfg->ops->lib->txq_update_byte_cnt_tbl(priv, txq,
		le16_to_cpu(tx_cmd->len));