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

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

@@ -356,10 +356,10 @@ static int iwl3945_send_beacon_cmd(struc

static void iwl3945_unset_hw_params(struct iwl_priv *priv)

{

if (priv->shared_virt)

- pci_free_consistent(priv->pci_dev,

- sizeof(struct iwl3945_shared),

- priv->shared_virt,

- priv->shared_phys);

+ dma_free_coherent(&priv->pci_dev->dev,

+ sizeof(struct iwl3945_shared),

+ priv->shared_virt,

+ priv->shared_phys);

}

static void iwl3945_build_tx_cmd_hwcrypto(struct iwl_priv *priv,

@@ -1272,10 +1272,10 @@ static void iwl3945_rx_queue_free(struct

}

}

- pci_free_consistent(priv->pci_dev, 4 * RX_QUEUE_SIZE, rxq->bd,

- rxq->dma_addr);

- pci_free_consistent(priv->pci_dev, sizeof(struct iwl_rb_status),

- rxq->rb_stts, rxq->rb_stts_dma);

+ dma_free_coherent(&priv->pci_dev->dev, 4 * RX_QUEUE_SIZE, rxq->bd,

+ rxq->dma_addr);

+ dma_free_coherent(&priv->pci_dev->dev, sizeof(struct iwl_rb_status),

+ rxq->rb_stts, rxq->rb_stts_dma);

rxq->bd = NULL;

rxq->rb_stts = NULL;

}

@@ -1904,7 +1904,7 @@ static void iwl3945_init_hw_rates(struct

{

int i;

- for (i = 0; i < IWL_RATE_COUNT; i++) {

+ for (i = 0; i < IWL_RATE_COUNT_LEGACY; i++) {

rates[i].bitrate = iwl3945_rates[i].ieee * 5;

rates[i].hw_value = i; /* Rate scaling will work on indexes */

rates[i].hw_value_short = i;