diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-04-06 04:12:41 -0700 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-04-16 13:47:23 -0700 |
| commit | 811ecc995b18eb58067ffa75b961ece3b84a1f03 (patch) | |
| tree | b43eaf5d490ac1552171c6fc3d8ac27f3a6f96ae /drivers/net/wireless/iwlwifi/iwl-scan.c | |
| parent | b165cf09c0248262232c7566df5ae40284cee7d6 (diff) | |
| download | kernel_samsung_smdk4412-811ecc995b18eb58067ffa75b961ece3b84a1f03.zip kernel_samsung_smdk4412-811ecc995b18eb58067ffa75b961ece3b84a1f03.tar.gz kernel_samsung_smdk4412-811ecc995b18eb58067ffa75b961ece3b84a1f03.tar.bz2 | |
iwlwifi: rename priv->scan to priv->scan_cmd
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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index cb3601d..18b89d3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -680,16 +680,16 @@ static void iwl_bg_request_scan(struct work_struct *data) goto done; } - if (!priv->scan) { - priv->scan = kmalloc(sizeof(struct iwl_scan_cmd) + - IWL_MAX_SCAN_SIZE, GFP_KERNEL); - if (!priv->scan) { + if (!priv->scan_cmd) { + priv->scan_cmd = kmalloc(sizeof(struct iwl_scan_cmd) + + IWL_MAX_SCAN_SIZE, GFP_KERNEL); + if (!priv->scan_cmd) { IWL_DEBUG_SCAN(priv, "fail to allocate memory for scan\n"); goto done; } } - scan = priv->scan; + scan = priv->scan_cmd; memset(scan, 0, sizeof(struct iwl_scan_cmd) + IWL_MAX_SCAN_SIZE); scan->quiet_plcp_th = IWL_PLCP_QUIET_THRESH; |