Commit 93a984a4 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlegacy: regulatory_bands is not an ops 



Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a5f16137

drivers/net/wireless/iwlegacy/3945.c

+25 −14
Original line number Diff line number Diff line
@@ -2646,15 +2646,6 @@ static struct il_lib_ops il3945_lib = { 
		    .config = il3945_nic_config,

		    },

	.eeprom_ops = {

		       .regulatory_bands = {

					    EEPROM_REGULATORY_BAND_1_CHANNELS,

					    EEPROM_REGULATORY_BAND_2_CHANNELS,

					    EEPROM_REGULATORY_BAND_3_CHANNELS,

					    EEPROM_REGULATORY_BAND_4_CHANNELS,

					    EEPROM_REGULATORY_BAND_5_CHANNELS,

					    EEPROM_REGULATORY_BAND_NO_HT40,

					    EEPROM_REGULATORY_BAND_NO_HT40,

					    },

		.acquire_semaphore = il3945_eeprom_acquire_semaphore,

		.release_semaphore = il3945_eeprom_release_semaphore,

	},
@@ -2707,7 +2698,17 @@ static struct il_cfg il3945_bg_cfg = { 
	.set_l0s = false,

	.use_bsm = true,

	.led_compensation = 64,

	.wd_timeout = IL_DEF_WD_TIMEOUT

	.wd_timeout = IL_DEF_WD_TIMEOUT,



	.regulatory_bands = {

		EEPROM_REGULATORY_BAND_1_CHANNELS,

		EEPROM_REGULATORY_BAND_2_CHANNELS,

		EEPROM_REGULATORY_BAND_3_CHANNELS,

		EEPROM_REGULATORY_BAND_4_CHANNELS,

		EEPROM_REGULATORY_BAND_5_CHANNELS,

		EEPROM_REGULATORY_BAND_NO_HT40,

		EEPROM_REGULATORY_BAND_NO_HT40,

	},

};



static struct il_cfg il3945_abg_cfg = {
@@ -2726,7 +2727,17 @@ static struct il_cfg il3945_abg_cfg = { 
	.set_l0s = false,

	.use_bsm = true,

	.led_compensation = 64,

	.wd_timeout = IL_DEF_WD_TIMEOUT

	.wd_timeout = IL_DEF_WD_TIMEOUT,



	.regulatory_bands = {

		EEPROM_REGULATORY_BAND_1_CHANNELS,

		EEPROM_REGULATORY_BAND_2_CHANNELS,

		EEPROM_REGULATORY_BAND_3_CHANNELS,

		EEPROM_REGULATORY_BAND_4_CHANNELS,

		EEPROM_REGULATORY_BAND_5_CHANNELS,

		EEPROM_REGULATORY_BAND_NO_HT40,

		EEPROM_REGULATORY_BAND_NO_HT40,

	},

};



DEFINE_PCI_DEVICE_TABLE(il3945_hw_card_ids) = {

drivers/net/wireless/iwlegacy/4965.c

+11 −8
Original line number Diff line number Diff line
@@ -2217,14 +2217,6 @@ static struct il_lib_ops il4965_lib = { 
		    .config = il4965_nic_config,

		    },

	.eeprom_ops = {

		       .regulatory_bands = {

					    EEPROM_REGULATORY_BAND_1_CHANNELS,

					    EEPROM_REGULATORY_BAND_2_CHANNELS,

					    EEPROM_REGULATORY_BAND_3_CHANNELS,

					    EEPROM_REGULATORY_BAND_4_CHANNELS,

					    EEPROM_REGULATORY_BAND_5_CHANNELS,

					    EEPROM_4965_REGULATORY_BAND_24_HT40_CHANNELS,

					    EEPROM_4965_REGULATORY_BAND_52_HT40_CHANNELS},

		       .acquire_semaphore = il4965_eeprom_acquire_semaphore,

		       .release_semaphore = il4965_eeprom_release_semaphore,

		       },
@@ -2288,6 +2280,17 @@ struct il_cfg il4965_cfg = { 
	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,



	.regulatory_bands = {

		EEPROM_REGULATORY_BAND_1_CHANNELS,

		EEPROM_REGULATORY_BAND_2_CHANNELS,

		EEPROM_REGULATORY_BAND_3_CHANNELS,

		EEPROM_REGULATORY_BAND_4_CHANNELS,

		EEPROM_REGULATORY_BAND_5_CHANNELS,

		EEPROM_4965_REGULATORY_BAND_24_HT40_CHANNELS,

		EEPROM_4965_REGULATORY_BAND_52_HT40_CHANNELS

	},



};



/* Module firmware */

drivers/net/wireless/iwlegacy/common.c

+4 −6
Original line number Diff line number Diff line
@@ -798,8 +798,8 @@ il_init_band_reference(const struct il_priv *il, int eep_band, 
		       const struct il_eeprom_channel **eeprom_ch_info,

		       const u8 **eeprom_ch_idx)

{

	u32 offset =

	    il->ops->lib->eeprom_ops.regulatory_bands[eep_band - 1];

	u32 offset = il->cfg->regulatory_bands[eep_band - 1];



	switch (eep_band) {

	case 1:		/* 2.4GHz band */

		*eeprom_ch_count = ARRAY_SIZE(il_eeprom_band_1);
@@ -1000,10 +1000,8 @@ il_init_channel_map(struct il_priv *il) 
	}



	/* Check if we do have HT40 channels */

	if (il->ops->lib->eeprom_ops.regulatory_bands[5] ==

	    EEPROM_REGULATORY_BAND_NO_HT40 &&

	    il->ops->lib->eeprom_ops.regulatory_bands[6] ==

	    EEPROM_REGULATORY_BAND_NO_HT40)

	if (il->cfg->regulatory_bands[5] == EEPROM_REGULATORY_BAND_NO_HT40 &&

	    il->cfg->regulatory_bands[6] == EEPROM_REGULATORY_BAND_NO_HT40)

		return 0;



	/* Two additional EEPROM bands for 2.4 and 5 GHz HT40 channels */

drivers/net/wireless/iwlegacy/common.h

+2 −1
Original line number Diff line number Diff line
@@ -426,7 +426,6 @@ struct il_eeprom_calib_info { 
#define EEPROM_REGULATORY_BAND_NO_HT40			(0)



struct il_eeprom_ops {

	const u32 regulatory_bands[7];

	int (*acquire_semaphore) (struct il_priv *il);

	void (*release_semaphore) (struct il_priv *il);

};
@@ -1769,6 +1768,8 @@ struct il_cfg { 
	const bool ucode_tracing;

	const bool sensitivity_calib_by_driver;

	const bool chain_noise_calib_by_driver;



	const u32 regulatory_bands[7];

};



/***************************