summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorWinkler, Tomas <tomas.winkler@intel.com>2009-01-19 15:30:28 -0800
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 16:00:57 -0500
commit805cee5b81f1e493820601fe7990aef935c2c621 (patch)
tree1714259828c667653c78f90a5eda85120ab34ebf /drivers/net
parent518099a870ef3f5f97d96aa0c284ce1b403436fa (diff)
downloadkernel-crypto-805cee5b81f1e493820601fe7990aef935c2c621.tar.gz
kernel-crypto-805cee5b81f1e493820601fe7990aef935c2c621.tar.xz
kernel-crypto-805cee5b81f1e493820601fe7990aef935c2c621.zip
iwlwifi: kill scan39
scan and scan39 can be represented by void * in iwl_priv Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Acked-by: Samuel Ortiz <samuel.ortiz@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c10
2 files changed, 6 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 4d437cf50c8..5b5e011497c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -848,7 +848,7 @@ struct iwl_priv {
unsigned long scan_start;
unsigned long scan_pass_start;
unsigned long scan_start_tsf;
- struct iwl_scan_cmd *scan;
+ void *scan;
int scan_bands;
int one_direct_scan;
u8 direct_ssid_len;
@@ -1071,8 +1071,6 @@ struct iwl_priv {
s8 user_txpower_limit;
s8 max_channel_txpower_limit;
- struct iwl3945_scan_cmd *scan39;
-
/* We declare this const so it can only be
* changed via explicit cast within the
* routines that actually update the physical
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index c8a1bdeaa43..9df3eef10c2 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -5270,15 +5270,15 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
goto done;
}
- if (!priv->scan39) {
- priv->scan39 = kmalloc(sizeof(struct iwl3945_scan_cmd) +
+ if (!priv->scan) {
+ priv->scan = kmalloc(sizeof(struct iwl3945_scan_cmd) +
IWL_MAX_SCAN_SIZE, GFP_KERNEL);
- if (!priv->scan39) {
+ if (!priv->scan) {
rc = -ENOMEM;
goto done;
}
}
- scan = priv->scan39;
+ scan = priv->scan;
memset(scan, 0, sizeof(struct iwl3945_scan_cmd) + IWL_MAX_SCAN_SIZE);
scan->quiet_plcp_th = IWL_PLCP_QUIET_THRESH;
@@ -7298,7 +7298,7 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
iwl3945_free_channel_map(priv);
iwl3945_free_geos(priv);
- kfree(priv->scan39);
+ kfree(priv->scan);
if (priv->ibss_beacon)
dev_kfree_skb(priv->ibss_beacon);