summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwmc3200wifi/main.c
diff options
context:
space:
mode:
authorZhu Yi <yi.zhu@intel.com>2009-06-25 12:28:31 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 21:02:25 +0200
commitfd2c7fe0b4dedc34ea0a2a72e00648bd2b8c7c3a (patch)
treebf112bfd0dcb3a7d6efdb8af59898a65e3cf6167 /drivers/net/wireless/iwmc3200wifi/main.c
parentiwmc3200wifi: replace netif_rx with netif_rx_ni (diff)
downloadlinux-fd2c7fe0b4dedc34ea0a2a72e00648bd2b8c7c3a.tar.xz
linux-fd2c7fe0b4dedc34ea0a2a72e00648bd2b8c7c3a.zip
iwmc3200wifi: simplify calibration map
The patch simplifies calibration map by combining the init_calib_map and periodic_calib_map into one calib_map in struct iwm_conf. Now the initial calibration map is stored in the lower 16 bits of calib_map and the periodic calibration map is stored in the higher 16 bits. Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/main.c')
-rw-r--r--drivers/net/wireless/iwmc3200wifi/main.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/main.c b/drivers/net/wireless/iwmc3200wifi/main.c
index 930056b013f3..4fedb45d62b3 100644
--- a/drivers/net/wireless/iwmc3200wifi/main.c
+++ b/drivers/net/wireless/iwmc3200wifi/main.c
@@ -53,11 +53,7 @@
static struct iwm_conf def_iwm_conf = {
.sdio_ior_timeout = 5000,
- .init_calib_map = BIT(PHY_CALIBRATE_DC_CMD) |
- BIT(PHY_CALIBRATE_LO_CMD) |
- BIT(PHY_CALIBRATE_TX_IQ_CMD) |
- BIT(PHY_CALIBRATE_RX_IQ_CMD),
- .periodic_calib_map = BIT(PHY_CALIBRATE_DC_CMD) |
+ .calib_map = BIT(PHY_CALIBRATE_DC_CMD) |
BIT(PHY_CALIBRATE_LO_CMD) |
BIT(PHY_CALIBRATE_TX_IQ_CMD) |
BIT(PHY_CALIBRATE_RX_IQ_CMD) |