lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwlwifi: kill scan39

Browse Source 
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>
This commit is contained in:
Winkler, Tomas
2009-01-19 15:30:28 -08:00
committed by John W. Linville
parent 518099a870
commit 805cee5b81
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/iwlwifi/iwl-dev.h
View File

@@ -848,7 +848,7 @@ struct iwl_priv {
unsigned long scan_start; unsigned long scan_start;
unsigned long scan_pass_start; unsigned long scan_pass_start;
unsigned long scan_start_tsf; unsigned long scan_start_tsf;
struct iwl_scan_cmd *scan; void *scan;
int scan_bands; int scan_bands;
int one_direct_scan; int one_direct_scan;
u8 direct_ssid_len; u8 direct_ssid_len;
@@ -1071,8 +1071,6 @@ struct iwl_priv {
s8 user_txpower_limit; s8 user_txpower_limit;
s8 max_channel_txpower_limit; s8 max_channel_txpower_limit;
struct iwl3945_scan_cmd *scan39;
/* We declare this const so it can only be /* We declare this const so it can only be
* changed via explicit cast within the * changed via explicit cast within the
* routines that actually update the physical * routines that actually update the physical

10
drivers/net/wireless/iwlwifi/iwl3945-base.c
View File

@@ -5270,15 +5270,15 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
goto done; goto done;
} }
if (!priv->scan39) { if (!priv->scan) {
priv->scan39 = kmalloc(sizeof(struct iwl3945_scan_cmd) + priv->scan = kmalloc(sizeof(struct iwl3945_scan_cmd) +
IWL_MAX_SCAN_SIZE, GFP_KERNEL); IWL_MAX_SCAN_SIZE, GFP_KERNEL);
if (!priv->scan39) { if (!priv->scan) {
rc = -ENOMEM; rc = -ENOMEM;
goto done; goto done;
} }
} }
scan = priv->scan39; scan = priv->scan;
memset(scan, 0, sizeof(struct iwl3945_scan_cmd) + IWL_MAX_SCAN_SIZE); memset(scan, 0, sizeof(struct iwl3945_scan_cmd) + IWL_MAX_SCAN_SIZE);
scan->quiet_plcp_th = IWL_PLCP_QUIET_THRESH; 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_channel_map(priv);
iwl3945_free_geos(priv); iwl3945_free_geos(priv);
kfree(priv->scan39); kfree(priv->scan);
if (priv->ibss_beacon) if (priv->ibss_beacon)
dev_kfree_skb(priv->ibss_beacon); dev_kfree_skb(priv->ibss_beacon);