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

Commit eca4c3d2 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents f6caa14a 99f1b015

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

+3 −0
Original line number Diff line number Diff line
@@ -1332,6 +1332,9 @@ int iwl_setup_mac(struct iwl_priv *priv) 


	hw->wiphy->custom_regulatory = true;



	/* Firmware does not support this */

	hw->wiphy->disable_beacon_hints = true;



	hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX;

	/* we create the 802.11 header and a zero-length SSID element */

	hw->wiphy->max_scan_ie_len = IWL_MAX_PROBE_REQUEST - 24 - 2;

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

+6 −6
Original line number Diff line number Diff line
@@ -308,18 +308,18 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file, 
		return -ENODATA;

	}



	ptr = priv->eeprom;

	if (!ptr) {

		IWL_ERR(priv, "Invalid EEPROM/OTP memory\n");

		return -ENOMEM;

	}



	/* 4 characters for byte 0xYY */

	buf = kzalloc(buf_size, GFP_KERNEL);

	if (!buf) {

		IWL_ERR(priv, "Can not allocate Buffer\n");

		return -ENOMEM;

	}



	ptr = priv->eeprom;

	if (!ptr) {

		IWL_ERR(priv, "Invalid EEPROM/OTP memory\n");

		return -ENOMEM;

	}

	pos += scnprintf(buf + pos, buf_size - pos, "NVM Type: %s\n",

			(priv->nvm_device_type == NVM_DEVICE_TYPE_OTP)

			? "OTP" : "EEPROM");

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

+12 −0
Original line number Diff line number Diff line
@@ -566,6 +566,8 @@ int iwl_remove_default_wep_key(struct iwl_priv *priv, 
	unsigned long flags;



	spin_lock_irqsave(&priv->sta_lock, flags);

	IWL_DEBUG_WEP(priv, "Removing default WEP key: idx=%d\n",

		      keyconf->keyidx);



	if (!test_and_clear_bit(keyconf->keyidx, &priv->ucode_key_table))

		IWL_ERR(priv, "index %d not used in uCode key table.\n",
@@ -573,6 +575,11 @@ int iwl_remove_default_wep_key(struct iwl_priv *priv, 


	priv->default_wep_key--;

	memset(&priv->wep_keys[keyconf->keyidx], 0, sizeof(priv->wep_keys[0]));

	if (iwl_is_rfkill(priv)) {

		IWL_DEBUG_WEP(priv, "Not sending REPLY_WEPKEY command due to RFKILL.\n");

		spin_unlock_irqrestore(&priv->sta_lock, flags);

		return 0;

	}

	ret = iwl_send_static_wepkey_cmd(priv, 1);

	IWL_DEBUG_WEP(priv, "Remove default WEP key: idx=%d ret=%d\n",

		      keyconf->keyidx, ret);
@@ -853,6 +860,11 @@ int iwl_remove_dynamic_key(struct iwl_priv *priv, 
	priv->stations[sta_id].sta.sta.modify_mask = STA_MODIFY_KEY_MASK;

	priv->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;



	if (iwl_is_rfkill(priv)) {

		IWL_DEBUG_WEP(priv, "Not sending REPLY_ADD_STA command because RFKILL enabled. \n");

		spin_unlock_irqrestore(&priv->sta_lock, flags);

		return 0;

	}

	ret =  iwl_send_add_sta(priv, &priv->stations[sta_id].sta, CMD_ASYNC);

	spin_unlock_irqrestore(&priv->sta_lock, flags);

	return ret;

drivers/net/wireless/iwlwifi/iwl3945-base.c

+3 −0
Original line number Diff line number Diff line
@@ -3968,6 +3968,9 @@ static int iwl3945_setup_mac(struct iwl_priv *priv) 


	hw->wiphy->custom_regulatory = true;



	/* Firmware does not support this */

	hw->wiphy->disable_beacon_hints = true;



	hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX_3945;

	/* we create the 802.11 header and a zero-length SSID element */

	hw->wiphy->max_scan_ie_len = IWL_MAX_PROBE_REQUEST - 24 - 2;

drivers/net/wireless/iwmc3200wifi/commands.c

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ int iwm_store_rxiq_calib_result(struct iwm_priv *iwm) 
	eeprom_rxiq = iwm_eeprom_access(iwm, IWM_EEPROM_CALIB_RXIQ);

	if (IS_ERR(eeprom_rxiq)) {

		IWM_ERR(iwm, "Couldn't access EEPROM RX IQ entry\n");

		kfree(rxiq);

		return PTR_ERR(eeprom_rxiq);

	}