Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 811ecc99 authored by Johannes Berg's avatar Johannes Berg Committed by Reinette Chatre
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent b165cf09

drivers/net/wireless/iwlwifi/iwl-agn.c

+1 −1
Original line number Diff line number Diff line
@@ -3400,7 +3400,7 @@ static void iwl_uninit_drv(struct iwl_priv *priv) 
	iwl_calib_free_results(priv);

	iwlcore_free_geos(priv);

	iwl_free_channel_map(priv);

	kfree(priv->scan);

	kfree(priv->scan_cmd);

}



static struct attribute *iwl_sysfs_entries[] = {

drivers/net/wireless/iwlwifi/iwl-dev.h

+1 −1
Original line number Diff line number Diff line
@@ -1051,7 +1051,7 @@ struct iwl_priv { 
	/* Scan related variables */

	unsigned long scan_start;

	unsigned long scan_start_tsf;

	void *scan;

	void *scan_cmd;

	enum ieee80211_band scan_band;

	struct cfg80211_scan_request *scan_request;

	bool is_internal_short_scan;

drivers/net/wireless/iwlwifi/iwl-scan.c

+5 −5
Original line number Diff line number Diff line
@@ -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) +

	if (!priv->scan_cmd) {

		priv->scan_cmd = kmalloc(sizeof(struct iwl_scan_cmd) +

					 IWL_MAX_SCAN_SIZE, GFP_KERNEL);

		if (!priv->scan) {

		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;

drivers/net/wireless/iwlwifi/iwl3945-base.c

+6 −6
Original line number Diff line number Diff line
@@ -2852,15 +2852,15 @@ static void iwl3945_bg_request_scan(struct work_struct *data) 
		goto done;

	}



	if (!priv->scan) {

		priv->scan = kmalloc(sizeof(struct iwl3945_scan_cmd) +

	if (!priv->scan_cmd) {

		priv->scan_cmd = kmalloc(sizeof(struct iwl3945_scan_cmd) +

					 IWL_MAX_SCAN_SIZE, GFP_KERNEL);

		if (!priv->scan) {

		if (!priv->scan_cmd) {

			IWL_DEBUG_SCAN(priv, "Fail to allocate scan memory\n");

			goto done;

		}

	}

	scan = priv->scan;

	scan = priv->scan_cmd;

	memset(scan, 0, sizeof(struct iwl3945_scan_cmd) + IWL_MAX_SCAN_SIZE);



	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);

	iwlcore_free_geos(priv);

	kfree(priv->scan);

	kfree(priv->scan_cmd);

	if (priv->ibss_beacon)

		dev_kfree_skb(priv->ibss_beacon);