mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 23:25:07 +00:00
Code Issues Releases Wiki Activity

iwlwifi: move the shrd memory from priv

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

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
This commit is contained in:
Emmanuel Grumbach 2012-02-02 14:08:57 -08:00 committed by Wey-Yi Guy
parent 8747bb4936
commit e81fb554cf
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1780,9 +1780,7 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops,
} }
priv = hw->priv; priv = hw->priv;
priv->shrd = &priv->_shrd; priv->shrd = bus->shrd;
bus->shrd = priv->shrd;
priv->shrd->bus = bus;
priv->shrd->priv = priv; priv->shrd->priv = priv;
priv->shrd->trans = trans_ops->alloc(priv->shrd); priv->shrd->trans = trans_ops->alloc(priv->shrd);

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

@ -821,7 +821,6 @@ struct iwl_wipan_noa_data {
struct iwl_priv { struct iwl_priv {
/*data shared among all the driver's layers */ /*data shared among all the driver's layers */
struct iwl_shared _shrd;
struct iwl_shared *shrd; struct iwl_shared *shrd;
/* ieee device used by generic ieee processing code */ /* ieee device used by generic ieee processing code */

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

@ -374,10 +374,18 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (!bus) { if (!bus) {
dev_printk(KERN_ERR, &pdev->dev, dev_printk(KERN_ERR, &pdev->dev,
"Couldn't allocate iwl_pci_bus"); "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; err = -ENOMEM;
goto out_no_pci; goto out_no_pci;
} }
bus->shrd->bus = bus;
pci_bus = IWL_BUS_GET_PCI_BUS(bus); pci_bus = IWL_BUS_GET_PCI_BUS(bus);
pci_bus->pci_dev = pdev; 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: out_pci_disable_device:
pci_disable_device(pdev); pci_disable_device(pdev);
out_no_pci: out_no_pci:
kfree(bus->shrd);
kfree(bus); kfree(bus);
return err; return err;
} }
@ -491,6 +500,7 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)
pci_disable_device(pci_dev); pci_disable_device(pci_dev);
pci_set_drvdata(pci_dev, NULL); pci_set_drvdata(pci_dev, NULL);
kfree(bus->shrd);
kfree(bus); kfree(bus);
} }