diff options
author | David S. Miller <davem@davemloft.net> | 2010-08-19 16:54:13 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-19 16:54:13 -0700 |
commit | 48d3ff82698cb0094684aed70446e0a5cbb1a4d0 (patch) | |
tree | 4f3554f1e82d17d60d0e1e3bf95dfea1120f0374 /drivers/net/wireless/ipw2x00/ipw2100.c | |
parent | 1aef70ef125165e0114a8e475636eff242a52030 (diff) | |
parent | 6a017e043a8c5e4f1e7c1152bc6477da8066f5f6 (diff) | |
download | op-kernel-dev-48d3ff82698cb0094684aed70446e0a5cbb1a4d0.zip op-kernel-dev-48d3ff82698cb0094684aed70446e0a5cbb1a4d0.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2100.c')
-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 1189dbb..996e9d7 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) packet = &priv->rx_buffers[i]; - /* Sync the DMA for the STATUS buffer so CPU is sure to get - * the correct values */ - pci_dma_sync_single_for_cpu(priv->pci_dev, - sq->nic + - sizeof(struct ipw2100_status) * i, - sizeof(struct ipw2100_status), - PCI_DMA_FROMDEVICE); - /* Sync the DMA for the RX buffer so CPU is sure to get * the correct values */ pci_dma_sync_single_for_cpu(priv->pci_dev, packet->dma_addr, |