lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/wireless/orinoco/main.c
This commit is contained in:
David S. Miller
2009-07-16 20:21:24 -07:00
parent c86ae82605 7fefe6a884
commit da8120355e
40 changed files with 192 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/e100.c
View File

@@ -1897,6 +1897,9 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx,
if (ioread8(&nic->csr->scb.status) & rus_no_res)
nic->ru_running = RU_SUSPENDED;
pci_dma_sync_single_for_device(nic->pdev, rx->dma_addr,
sizeof(struct rfd),
PCI_DMA_BIDIRECTIONAL);
return -ENODATA;
}