diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-08-24 16:35:40 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-24 16:35:40 -0400 |
| commit | 268bae0b6879f238ba57f5f801958d1254e136f7 (patch) | |
| tree | 132d1039370644b2c6a2d2f8903024de3e47b020 /drivers/net/wireless/ipw2x00 | |
| parent | d70e96932de55fb2c05b1c0af1dff178651a9b77 (diff) | |
| parent | 6a017e043a8c5e4f1e7c1152bc6477da8066f5f6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'drivers/net/wireless/ipw2x00')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 0c3963d38f8..ed69e60f86a 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c | |||
| @@ -2723,14 +2723,6 @@ static void __ipw2100_rx_process(struct ipw2100_priv *priv) | |||
| 2723 | 2723 | ||
| 2724 | packet = &priv->rx_buffers[i]; | 2724 | packet = &priv->rx_buffers[i]; |
| 2725 | 2725 | ||
| 2726 | /* Sync the DMA for the STATUS buffer so CPU is sure to get | ||
| 2727 | * the correct values */ | ||
| 2728 | pci_dma_sync_single_for_cpu(priv->pci_dev, | ||
| 2729 | sq->nic + | ||
| 2730 | sizeof(struct ipw2100_status) * i, | ||
| 2731 | sizeof(struct ipw2100_status), | ||
| 2732 | PCI_DMA_FROMDEVICE); | ||
| 2733 | |||
| 2734 | /* Sync the DMA for the RX buffer so CPU is sure to get | 2726 | /* Sync the DMA for the RX buffer so CPU is sure to get |
| 2735 | * the correct values */ | 2727 | * the correct values */ |
| 2736 | pci_dma_sync_single_for_cpu(priv->pci_dev, packet->dma_addr, | 2728 | pci_dma_sync_single_for_cpu(priv->pci_dev, packet->dma_addr, |