summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-07-26 13:26:09 -0700
committerDavid S. Miller <davem@davemloft.net>2010-07-26 13:26:09 -0700
commita9ad99a612763803b995ce551ca43b20beb1f888 (patch)
treedaff243cc83116bdcffc5f675d0f33c0f777cc69 /drivers/net
parentc736eefadb71a01a5e61e0de700f28f6952b4444 (diff)
parentf792af250de54309e4bc9f238db3623ead0a4507 (diff)
downloadlinux-a9ad99a612763803b995ce551ca43b20beb1f888.tar.gz
linux-a9ad99a612763803b995ce551ca43b20beb1f888.tar.bz2
linux-a9ad99a612763803b995ce551ca43b20beb1f888.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ath/ath9k/recv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index ca6065b71b46..e3e52913d83a 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -844,9 +844,9 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
int dma_type;
if (edma)
- dma_type = DMA_FROM_DEVICE;
- else
dma_type = DMA_BIDIRECTIONAL;
+ else
+ dma_type = DMA_FROM_DEVICE;
qtype = hp ? ATH9K_RX_QUEUE_HP : ATH9K_RX_QUEUE_LP;
spin_lock_bh(&sc->rx.rxbuflock);