Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

iwlwifi: rename priv->scan to priv->scan_cmd

Browse source 
I keep checking what "priv->scan" is, so rename
it to "priv->scan_cmd" which more clearly tells
us what it is.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
This commit is contained in:
Johannes Berg 2010-04-06 04:12:41 -07:00 committed by Reinette Chatre
parent b165cf09c0
commit 811ecc995b
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/iwlwifi/iwl-agn.c
View file

@ -3400,7 +3400,7 @@ static void iwl_uninit_drv(struct iwl_priv *priv)
iwl_calib_free_results(priv); iwl_calib_free_results(priv);
iwlcore_free_geos(priv); iwlcore_free_geos(priv);
iwl_free_channel_map(priv); iwl_free_channel_map(priv);
kfree(priv->scan); kfree(priv->scan_cmd);
} }
static struct attribute *iwl_sysfs_entries[] = { static struct attribute *iwl_sysfs_entries[] = {

2
drivers/net/wireless/iwlwifi/iwl-dev.h
View file

@ -1051,7 +1051,7 @@ struct iwl_priv {
/* Scan related variables */ /* Scan related variables */
unsigned long scan_start; unsigned long scan_start;
unsigned long scan_start_tsf; unsigned long scan_start_tsf;
void *scan; void *scan_cmd;
enum ieee80211_band scan_band; enum ieee80211_band scan_band;
struct cfg80211_scan_request *scan_request; struct cfg80211_scan_request *scan_request;
bool is_internal_short_scan; bool is_internal_short_scan;

10
drivers/net/wireless/iwlwifi/iwl-scan.c
View file

@ -680,16 +680,16 @@ static void iwl_bg_request_scan(struct work_struct *data)
goto done; goto done;
} }
if (!priv->scan) { if (!priv->scan_cmd) {
priv->scan = kmalloc(sizeof(struct iwl_scan_cmd) + priv->scan_cmd = kmalloc(sizeof(struct iwl_scan_cmd) +
IWL_MAX_SCAN_SIZE, GFP_KERNEL); IWL_MAX_SCAN_SIZE, GFP_KERNEL);
if (!priv->scan) { if (!priv->scan_cmd) {
IWL_DEBUG_SCAN(priv, IWL_DEBUG_SCAN(priv,
"fail to allocate memory for scan\n"); "fail to allocate memory for scan\n");
goto done; goto done;
} }
} }
scan = priv->scan; scan = priv->scan_cmd;
memset(scan, 0, sizeof(struct iwl_scan_cmd) + IWL_MAX_SCAN_SIZE); memset(scan, 0, sizeof(struct iwl_scan_cmd) + IWL_MAX_SCAN_SIZE);
scan->quiet_plcp_th = IWL_PLCP_QUIET_THRESH; scan->quiet_plcp_th = IWL_PLCP_QUIET_THRESH;

12
drivers/net/wireless/iwlwifi/iwl3945-base.c
View file

@ -2852,15 +2852,15 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
goto done; goto done;
} }
if (!priv->scan) { if (!priv->scan_cmd) {
priv->scan = kmalloc(sizeof(struct iwl3945_scan_cmd) + priv->scan_cmd = kmalloc(sizeof(struct iwl3945_scan_cmd) +
IWL_MAX_SCAN_SIZE, GFP_KERNEL); IWL_MAX_SCAN_SIZE, GFP_KERNEL);
if (!priv->scan) { if (!priv->scan_cmd) {
IWL_DEBUG_SCAN(priv, "Fail to allocate scan memory\n"); IWL_DEBUG_SCAN(priv, "Fail to allocate scan memory\n");
goto done; goto done;
} }
} }
scan = priv->scan; scan = priv->scan_cmd;
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;
@ -4245,7 +4245,7 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
iwl_free_channel_map(priv); iwl_free_channel_map(priv);
iwlcore_free_geos(priv); iwlcore_free_geos(priv);
kfree(priv->scan); kfree(priv->scan_cmd);
if (priv->ibss_beacon) if (priv->ibss_beacon)
dev_kfree_skb(priv->ibss_beacon); dev_kfree_skb(priv->ibss_beacon);