Commit 805cee5b authored by Winkler, Tomas's avatar Winkler, Tomas Committed by John W. Linville
Browse files

iwlwifi: kill scan39



scan and scan39 can be represented by void * in iwl_priv
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Acked-by: default avatarSamuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 518099a8
......@@ -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
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment