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

Commit 1d0a082d authored by Assaf Krauss's avatar Assaf Krauss Committed by John W. Linville
Browse files

iwlwifi: Probe Flow - Performing allocation in a separate function 



Performing allocation in a separate function (previously handled in
'probe')

Signed-off-by: default avatarAssaf Krauss <assaf.krauss@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 00acbc91

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

+27 −0
Original line number Diff line number Diff line
@@ -29,12 +29,15 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/version.h>

#include <net/mac80211.h>



struct iwl_priv; /* FIXME: remove */

#include "iwl-debug.h"

#include "iwl-eeprom.h"

#include "iwl-core.h"



#include "iwl-4965.h" /* FIXME: remove */



MODULE_DESCRIPTION("iwl core");

MODULE_VERSION(IWLWIFI_VERSION);

MODULE_AUTHOR(DRV_COPYRIGHT);
@@ -44,3 +47,27 @@ MODULE_LICENSE("GPL"); 
u32 iwl_debug_level;

EXPORT_SYMBOL(iwl_debug_level);

#endif



/* This function both allocates and initializes hw and priv. */

struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg,

		struct ieee80211_ops *hw_ops)

{

	struct iwl_priv *priv;



	/* mac80211 allocates memory for this device instance, including

	 *   space for this driver's private structure */

	struct ieee80211_hw *hw =

		ieee80211_alloc_hw(sizeof(struct iwl_priv), hw_ops);

	if (hw == NULL) {

		IWL_ERROR("Can not allocate network device\n");

		goto out;

	}



	priv = hw->priv;

	priv->hw = hw;



out:

	return hw;

}

EXPORT_SYMBOL(iwl_alloc_all);

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

+7 −0
Original line number Diff line number Diff line
@@ -103,4 +103,11 @@ struct iwl_cfg { 
	const struct iwl_mod_params *mod_params;

};



/***************************

 *   L i b                 *

 ***************************/



struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg,

		struct ieee80211_ops *hw_ops);



#endif /* __iwl_core_h__ */

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

+5 −8
Original line number Diff line number Diff line
@@ -8531,21 +8531,18 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e 
		iwl4965_hw_ops.hw_scan = NULL;

	}



	/* mac80211 allocates memory for this device instance, including

	 *   space for this driver's private structure */

	hw = ieee80211_alloc_hw(sizeof(struct iwl_priv), &iwl4965_hw_ops);

	if (hw == NULL) {

		IWL_ERROR("Can not allocate network device\n");

	hw = iwl_alloc_all(cfg, &iwl4965_hw_ops);

	if (!hw) {

		err = -ENOMEM;

		goto out;

	}

	priv = hw->priv;

	/* At this point both hw and priv are allocated. */



	SET_IEEE80211_DEV(hw, &pdev->dev);



	IWL_DEBUG_INFO("*** LOAD DRIVER ***\n");

	priv = hw->priv;

	priv->hw = hw;

	priv->cfg = cfg;



	priv->pci_dev = pdev;



#ifdef CONFIG_IWLWIFI_DEBUG