diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2010-02-10 14:07:45 +0100 |
|---|---|---|
| committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-02-11 19:27:18 +0100 |
| commit | f36d04abe684f9e2b07c6ebe9f77ae20eb5c1e84 (patch) | |
| tree | 80c559f22c2806c0627d4f49c6081d3a4888327b /drivers/net/wireless/iwlwifi/iwl-helpers.h | |
| parent | iwlwifi: Adjusting PLCP error threshold for 1000 NIC (diff) | |
| download | linux-f36d04abe684f9e2b07c6ebe9f77ae20eb5c1e84.tar.xz linux-f36d04abe684f9e2b07c6ebe9f77ae20eb5c1e84.zip | |
iwlwifi: use dma_alloc_coherent
Change pci_alloc_consistent() to dma_alloc_coherent() so we can use
GFP_KERNEL flag.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-helpers.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-helpers.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-helpers.h b/drivers/net/wireless/iwlwifi/iwl-helpers.h index 45af5bbc1c56..51a67fb2e185 100644 --- a/drivers/net/wireless/iwlwifi/iwl-helpers.h +++ b/drivers/net/wireless/iwlwifi/iwl-helpers.h @@ -80,8 +80,8 @@ static inline void iwl_free_fw_desc(struct pci_dev *pci_dev, struct fw_desc *desc) { if (desc->v_addr) - pci_free_consistent(pci_dev, desc->len, - desc->v_addr, desc->p_addr); + dma_free_coherent(&pci_dev->dev, desc->len, + desc->v_addr, desc->p_addr); desc->v_addr = NULL; desc->len = 0; } @@ -89,7 +89,8 @@ static inline void iwl_free_fw_desc(struct pci_dev *pci_dev, static inline int iwl_alloc_fw_desc(struct pci_dev *pci_dev, struct fw_desc *desc) { - desc->v_addr = pci_alloc_consistent(pci_dev, desc->len, &desc->p_addr); + desc->v_addr = dma_alloc_coherent(&pci_dev->dev, desc->len, + &desc->p_addr, GFP_KERNEL); return (desc->v_addr != NULL) ? 0 : -ENOMEM; } |