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

Commit fe7c4040 authored by Guy Cohen's avatar Guy Cohen Committed by John W. Linville
Browse files

iwlwifi: remove support for Narrow Channel (10Mhz) 



Setting Narrow Channel bit in the scan command caused the device
not to send probe request on all the channels

Signed-off-by: default avatarGuy Cohen <guy.cohen@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9e5b806c

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

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ enum { 
	EEPROM_CHANNEL_ACTIVE = (1 << 3),	/* active scanning allowed */

	EEPROM_CHANNEL_RADAR = (1 << 4),	/* radar detection required */

	EEPROM_CHANNEL_WIDE = (1 << 5),		/* 20 MHz channel okay */

	EEPROM_CHANNEL_NARROW = (1 << 6),	/* 10 MHz channel (not used) */

	/* Bit 6 Reserved (was Narrow Channel) */

	EEPROM_CHANNEL_DFS = (1 << 7),	/* dynamic freq selection candidate */

};

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

+0 −5
Original line number Diff line number Diff line
@@ -924,11 +924,6 @@ static inline int is_channel_valid(const struct iwl3945_channel_info *ch_info) 
	return (ch_info->flags & EEPROM_CHANNEL_VALID) ? 1 : 0;

}



static inline int is_channel_narrow(const struct iwl3945_channel_info *ch_info)

{

	return (ch_info->flags & EEPROM_CHANNEL_NARROW) ? 1 : 0;

}



static inline int is_channel_radar(const struct iwl3945_channel_info *ch_info)

{

	return (ch_info->flags & EEPROM_CHANNEL_RADAR) ? 1 : 0;

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

+0 −5
Original line number Diff line number Diff line
@@ -1227,11 +1227,6 @@ static inline int is_channel_valid(const struct iwl_channel_info *ch_info) 
	return (ch_info->flags & EEPROM_CHANNEL_VALID) ? 1 : 0;

}



static inline int is_channel_narrow(const struct iwl_channel_info *ch_info)

{

	return (ch_info->flags & EEPROM_CHANNEL_NARROW) ? 1 : 0;

}



static inline int is_channel_radar(const struct iwl_channel_info *ch_info)

{

	return (ch_info->flags & EEPROM_CHANNEL_RADAR) ? 1 : 0;

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

+2 −4
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static int iwl4965_set_fat_chan_info(struct iwl_priv *priv, 
	if (!is_channel_valid(ch_info))

		return -1;



	IWL_DEBUG_INFO("FAT Ch. %d [%sGHz] %s%s%s%s%s%s(0x%02x"

	IWL_DEBUG_INFO("FAT Ch. %d [%sGHz] %s%s%s%s%s(0x%02x"

			" %ddBm): Ad-Hoc %ssupported\n",

			ch_info->channel,

			is_channel_a_band(ch_info) ?
@@ -386,7 +386,6 @@ static int iwl4965_set_fat_chan_info(struct iwl_priv *priv, 
			CHECK_AND_PRINT(ACTIVE),

			CHECK_AND_PRINT(RADAR),

			CHECK_AND_PRINT(WIDE),

			CHECK_AND_PRINT(NARROW),

			CHECK_AND_PRINT(DFS),

			eeprom_ch->flags,

			eeprom_ch->max_power_avg,
@@ -490,7 +489,7 @@ int iwl_init_channel_map(struct iwl_priv *priv) 
			ch_info->scan_power = eeprom_ch_info[ch].max_power_avg;

			ch_info->min_power = 0;



			IWL_DEBUG_INFO("Ch. %d [%sGHz] %s%s%s%s%s%s%s(0x%02x"

			IWL_DEBUG_INFO("Ch. %d [%sGHz] %s%s%s%s%s%s(0x%02x"

				       " %ddBm): Ad-Hoc %ssupported\n",

				       ch_info->channel,

				       is_channel_a_band(ch_info) ?
@@ -500,7 +499,6 @@ int iwl_init_channel_map(struct iwl_priv *priv) 
				       CHECK_AND_PRINT_I(ACTIVE),

				       CHECK_AND_PRINT_I(RADAR),

				       CHECK_AND_PRINT_I(WIDE),

				       CHECK_AND_PRINT_I(NARROW),

				       CHECK_AND_PRINT_I(DFS),

				       eeprom_ch_info[ch].flags,

				       eeprom_ch_info[ch].max_power_avg,

drivers/net/wireless/iwlwifi/iwl-eeprom.h

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ enum { 
	EEPROM_CHANNEL_ACTIVE = (1 << 3),	/* active scanning allowed */

	EEPROM_CHANNEL_RADAR = (1 << 4),	/* radar detection required */

	EEPROM_CHANNEL_WIDE = (1 << 5),		/* 20 MHz channel okay */

	EEPROM_CHANNEL_NARROW = (1 << 6),	/* 10 MHz channel (not used) */

	/* Bit 6 Reserved (was Narrow Channel) */

	EEPROM_CHANNEL_DFS = (1 << 7),	/* dynamic freq selection candidate */

};