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

Commit e81fb554 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

iwlwifi: move the shrd memory from priv 



Allocating the shrd area dynamically will allow more agility
while revamping the flows.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 8747bb49

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

+1 −3
Original line number Diff line number Diff line
@@ -1780,9 +1780,7 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, 
	}



	priv = hw->priv;

	priv->shrd = &priv->_shrd;

	bus->shrd = priv->shrd;

	priv->shrd->bus = bus;

	priv->shrd = bus->shrd;

	priv->shrd->priv = priv;



	priv->shrd->trans = trans_ops->alloc(priv->shrd);

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

+0 −1
Original line number Diff line number Diff line
@@ -821,7 +821,6 @@ struct iwl_wipan_noa_data { 
struct iwl_priv {



	/*data shared among all the driver's layers */

	struct iwl_shared _shrd;

	struct iwl_shared *shrd;



	/* ieee device used by generic ieee processing code */

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

+10 −0
Original line number Diff line number Diff line
@@ -374,10 +374,18 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (!bus) {

		dev_printk(KERN_ERR, &pdev->dev,

			   "Couldn't allocate iwl_pci_bus");

		return -ENOMEM;

	}



	bus->shrd = kzalloc(sizeof(*bus->shrd), GFP_KERNEL);

	if (!bus->shrd) {

		dev_printk(KERN_ERR, &pdev->dev,

			   "Couldn't allocate iwl_shared");

		err = -ENOMEM;

		goto out_no_pci;

	}



	bus->shrd->bus = bus;

	pci_bus = IWL_BUS_GET_PCI_BUS(bus);

	pci_bus->pci_dev = pdev;
@@ -472,6 +480,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
out_pci_disable_device:

	pci_disable_device(pdev);

out_no_pci:

	kfree(bus->shrd);

	kfree(bus);

	return err;

}
@@ -491,6 +500,7 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev) 
	pci_disable_device(pci_dev);

	pci_set_drvdata(pci_dev, NULL);



	kfree(bus->shrd);

	kfree(bus);

}