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

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

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem
parents 9a2e0fb0 dfe21582

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

+8 −2
Original line number Original line Diff line number Diff line
@@ -4645,10 +4645,16 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah, 
	case 1:

	case 1:

		break;

		break;

	case 2:

	case 2:

		if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN)

			scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;

			scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;

		else

			scaledPower = 0;

		break;

		break;

	case 3:

	case 3:

		if (scaledPower > REDUCE_SCALED_POWER_BY_THREE_CHAIN)

			scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;

			scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;

		else

			scaledPower = 0;

		break;

		break;

	}

	}

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

+8 −2
Original line number Original line Diff line number Diff line
@@ -524,10 +524,16 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah, 
	case 1:

	case 1:

		break;

		break;

	case 2:

	case 2:

		if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN)

			scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;

			scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;

		else

			scaledPower = 0;

		break;

		break;

	case 3:

	case 3:

		if (scaledPower > REDUCE_SCALED_POWER_BY_THREE_CHAIN)

			scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;

			scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;

		else

			scaledPower = 0;

		break;

		break;

	}

	}

	scaledPower = max((u16)0, scaledPower);

	scaledPower = max((u16)0, scaledPower);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1543,7 +1543,7 @@ static void iwl4965_temperature_calib(struct iwl_priv *priv) 
	s32 temp;

	s32 temp;





	temp = iwl4965_hw_get_temperature(priv);

	temp = iwl4965_hw_get_temperature(priv);

	if (temp < 0)

	if (IWL_TX_POWER_TEMPERATURE_OUT_OF_RANGE(temp))

		return;

		return;





	if (priv->temperature != temp) {

	if (priv->temperature != temp) {

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

+18 −10
Original line number Original line Diff line number Diff line
@@ -603,19 +603,27 @@ struct iwl_cfg iwl6050_2abg_cfg = { 
	IWL_DEVICE_6050,

	IWL_DEVICE_6050,

};

};





#define IWL_DEVICE_6150						\

	.fw_name_pre = IWL6050_FW_PRE,				\

	.ucode_api_max = IWL6050_UCODE_API_MAX,			\

	.ucode_api_min = IWL6050_UCODE_API_MIN,			\

	.ops = &iwl6150_ops,					\

	.eeprom_ver = EEPROM_6150_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_6150_TX_POWER_VERSION,	\

	.base_params = &iwl6050_base_params,			\

	.need_dc_calib = true,					\

	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true



struct iwl_cfg iwl6150_bgn_cfg = {

struct iwl_cfg iwl6150_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN",

	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN",

	.fw_name_pre = IWL6050_FW_PRE,

	IWL_DEVICE_6150,

	.ucode_api_max = IWL6050_UCODE_API_MAX,

	.ucode_api_min = IWL6050_UCODE_API_MIN,

	.eeprom_ver = EEPROM_6150_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_6150_TX_POWER_VERSION,

	.ops = &iwl6150_ops,

	.base_params = &iwl6050_base_params,

	.ht_params = &iwl6000_ht_params,

	.ht_params = &iwl6000_ht_params,

	.need_dc_calib = true,

};

	.led_mode = IWL_LED_RF_STATE,



	.internal_wimax_coex = true,

struct iwl_cfg iwl6150_bg_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BG",

	IWL_DEVICE_6150,

};

};





struct iwl_cfg iwl6000_3agn_cfg = {

struct iwl_cfg iwl6000_3agn_cfg = {

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -3831,11 +3831,11 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { 




/* 6150 WiFi/WiMax Series */

/* 6150 WiFi/WiMax Series */

	{IWL_PCI_DEVICE(0x0885, 0x1305, iwl6150_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0885, 0x1305, iwl6150_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0885, 0x1306, iwl6150_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0885, 0x1307, iwl6150_bg_cfg)},

	{IWL_PCI_DEVICE(0x0885, 0x1325, iwl6150_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0885, 0x1325, iwl6150_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0885, 0x1326, iwl6150_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0885, 0x1327, iwl6150_bg_cfg)},

	{IWL_PCI_DEVICE(0x0886, 0x1315, iwl6150_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0886, 0x1315, iwl6150_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0886, 0x1316, iwl6150_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0886, 0x1317, iwl6150_bg_cfg)},





/* 1000 Series WiFi */

/* 1000 Series WiFi */

	{IWL_PCI_DEVICE(0x0083, 0x1205, iwl1000_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0083, 0x1205, iwl1000_bgn_cfg)},