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

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

Merge branch 'wireless-next-2.6' of... 

Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
parents f18d4463 91dd6c27

Documentation/feature-removal-schedule.txt

+23 −0
Original line number Diff line number Diff line
@@ -545,3 +545,26 @@ Why: udev fully replaces this special file system that only contains CAPI 
	NCCI TTY device nodes. User space (pppdcapiplugin) works without

	noticing the difference.

Who:	Jan Kiszka <jan.kiszka@web.de>



----------------------------



What:	iwlwifi 50XX module parameters

When:	2.6.40

Why:	The "..50" modules parameters were used to configure 5000 series and

	up devices; different set of module parameters also available for 4965

	with same functionalities. Consolidate both set into single place

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



Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com>



----------------------------



What:	iwl4965 alias support

When:	2.6.40

Why:	Internal alias support has been present in module-init-tools for some

	time, the MODULE_ALIAS("iwl4965") boilerplate aliases can be removed

	with no impact.



Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com>



----------------------------

drivers/net/wireless/iwlwifi/iwl-3945-hw.h

+0 −5
Original line number Diff line number Diff line
@@ -71,10 +71,6 @@ 


#include "iwl-eeprom.h"



/* Time constants */

#define SHORT_SLOT_TIME 9

#define LONG_SLOT_TIME 20



/* RSSI to dBm */

#define IWL39_RSSI_OFFSET	95
@@ -230,7 +226,6 @@ struct iwl3945_eeprom { 


/* 4 DATA + 1 CMD. There are 2 HCCA queues that are not used. */

#define IWL39_NUM_QUEUES        5

#define IWL_NUM_SCAN_RATES         (2)



#define IWL_DEFAULT_TX_RETRY  15

drivers/net/wireless/iwlwifi/iwl-4965-hw.h

+0 −24
Original line number Diff line number Diff line
@@ -81,26 +81,6 @@ 
 */

#define IWL49_FIRST_AMPDU_QUEUE	7



/* Time constants */

#define SHORT_SLOT_TIME 9

#define LONG_SLOT_TIME 20



/* RSSI to dBm */

#define IWL49_RSSI_OFFSET	44





/* PCI registers */

#define PCI_CFG_RETRY_TIMEOUT	0x041



/* PCI register values */

#define PCI_CFG_LINK_CTRL_VAL_L0S_EN	0x01

#define PCI_CFG_LINK_CTRL_VAL_L1_EN	0x02



#define IWL_NUM_SCAN_RATES         (2)



#define IWL_DEFAULT_TX_RETRY  15





/* Sizes and addresses for instruction and data memory (SRAM) in

 * 4965's embedded processor.  Driver access is via HBUS_TARG_MEM_* regs. */

#define IWL49_RTC_INST_LOWER_BOUND		(0x000000)
@@ -393,10 +373,6 @@ static inline int iwl4965_hw_valid_rtc_data_addr(u32 addr) 
 *     location(s) in command (struct iwl4965_txpowertable_cmd).

 */



/* Limit range of txpower output target to be between these values */

#define IWL_TX_POWER_TARGET_POWER_MIN       (0)	/* 0 dBm = 1 milliwatt */

#define IWL_TX_POWER_TARGET_POWER_MAX      (16)	/* 16 dBm */



/**

 * When MIMO is used (2 transmitters operating simultaneously), driver should

 * limit each transmitter to deliver a max of 3 dB below the regulatory limit

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

+8 −35
Original line number Diff line number Diff line
@@ -61,14 +61,6 @@ static int iwl4965_hw_get_temperature(struct iwl_priv *priv); 
#define _IWL4965_MODULE_FIRMWARE(api) IWL4965_FW_PRE #api ".ucode"

#define IWL4965_MODULE_FIRMWARE(api) _IWL4965_MODULE_FIRMWARE(api)





/* module parameters */

static struct iwl_mod_params iwl4965_mod_params = {

	.amsdu_size_8K = 1,

	.restart_fw = 1,

	/* the rest are 0 by default */

};



/* check contents of special bootstrap uCode SRAM */

static int iwl4965_verify_bsm(struct iwl_priv *priv)

{
@@ -1620,19 +1612,19 @@ static int iwl4965_is_temp_calib_needed(struct iwl_priv *priv) 


	/* get absolute value */

	if (temp_diff < 0) {

		IWL_DEBUG_POWER(priv, "Getting cooler, delta %d, \n", temp_diff);

		IWL_DEBUG_POWER(priv, "Getting cooler, delta %d\n", temp_diff);

		temp_diff = -temp_diff;

	} else if (temp_diff == 0)

		IWL_DEBUG_POWER(priv, "Same temp, \n");

		IWL_DEBUG_POWER(priv, "Temperature unchanged\n");

	else

		IWL_DEBUG_POWER(priv, "Getting warmer, delta %d, \n", temp_diff);

		IWL_DEBUG_POWER(priv, "Getting warmer, delta %d\n", temp_diff);



	if (temp_diff < IWL_TEMPERATURE_THRESHOLD) {

		IWL_DEBUG_POWER(priv, "Thermal txpower calib not needed\n");

		IWL_DEBUG_POWER(priv, " => thermal txpower calib not needed\n");

		return 0;

	}



	IWL_DEBUG_POWER(priv, "Thermal txpower calib needed\n");

	IWL_DEBUG_POWER(priv, " => thermal txpower calib needed\n");



	return 1;

}
@@ -2094,7 +2086,7 @@ static int iwl4965_calc_rssi(struct iwl_priv *priv, 


	/* dBm = max_rssi dB - agc dB - constant.

	 * Higher AGC (higher radio gain) means lower signal. */

	return max_rssi - agc - IWL49_RSSI_OFFSET;

	return max_rssi - agc - IWLAGN_RSSI_OFFSET;

}
@@ -2245,7 +2237,7 @@ struct iwl_cfg iwl4965_agn_cfg = { 
	.ops = &iwl4965_ops,

	.num_of_queues = IWL49_NUM_QUEUES,

	.num_of_ampdu_queues = IWL49_NUM_AMPDU_QUEUES,

	.mod_params = &iwl4965_mod_params,

	.mod_params = &iwlagn_mod_params,

	.valid_tx_ant = ANT_AB,

	.valid_rx_ant = ANT_ABC,

	.pll_cfg_val = 0,
@@ -2265,22 +2257,3 @@ struct iwl_cfg iwl4965_agn_cfg = { 
/* Module firmware */

MODULE_FIRMWARE(IWL4965_MODULE_FIRMWARE(IWL4965_UCODE_API_MAX));

module_param_named(antenna, iwl4965_mod_params.antenna, int, S_IRUGO);

MODULE_PARM_DESC(antenna, "select antenna (1=Main, 2=Aux, default 0 [both])");

module_param_named(swcrypto, iwl4965_mod_params.sw_crypto, int, S_IRUGO);

MODULE_PARM_DESC(swcrypto, "using crypto in software (default 0 [hardware])");

module_param_named(

	disable_hw_scan, iwl4965_mod_params.disable_hw_scan, int, S_IRUGO);

MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)");



module_param_named(queues_num, iwl4965_mod_params.num_of_queues, int, S_IRUGO);

MODULE_PARM_DESC(queues_num, "number of hw queues.");

/* 11n */

module_param_named(11n_disable, iwl4965_mod_params.disable_11n, int, S_IRUGO);

MODULE_PARM_DESC(11n_disable, "disable 11n functionality");

module_param_named(amsdu_size_8K, iwl4965_mod_params.amsdu_size_8K,

		   int, S_IRUGO);

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



module_param_named(fw_restart4965, iwl4965_mod_params.restart_fw, int, S_IRUGO);

MODULE_PARM_DESC(fw_restart4965, "restart firmware in case of error");

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

+0 −13
Original line number Diff line number Diff line
@@ -585,16 +585,3 @@ struct iwl_cfg iwl5150_abg_cfg = { 


MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX));
 


module_param_named(swcrypto50, iwlagn_mod_params.sw_crypto, bool, S_IRUGO);

MODULE_PARM_DESC(swcrypto50,

		  "using software crypto engine (default 0 [hardware])\n");

module_param_named(queues_num50, iwlagn_mod_params.num_of_queues, int, S_IRUGO);

MODULE_PARM_DESC(queues_num50, "number of hw queues in 50xx series");

module_param_named(11n_disable50, iwlagn_mod_params.disable_11n, int, S_IRUGO);

MODULE_PARM_DESC(11n_disable50, "disable 50XX 11n functionality");

module_param_named(amsdu_size_8K50, iwlagn_mod_params.amsdu_size_8K,

		   int, S_IRUGO);

MODULE_PARM_DESC(amsdu_size_8K50, "enable 8K amsdu size in 50XX series");

module_param_named(fw_restart50, iwlagn_mod_params.restart_fw, int, S_IRUGO);

MODULE_PARM_DESC(fw_restart50, "restart firmware in case of error");