| To: | jgarzik@xxxxxxxxx |
|---|---|
| Subject: | [PATCH 2.6.8.1-mm4 9/11] r8169: advertise DMA to high memory |
| From: | Francois Romieu <romieu@xxxxxxxxxxxxx> |
| Date: | Tue, 24 Aug 2004 00:56:20 +0200 |
| Cc: | akpm@xxxxxxxx, netdev@xxxxxxxxxxx |
| In-reply-to: | <20040823225505.GH20726@electric-eye.fr.zoreil.com> |
| References: | <20040823224100.GA14680@electric-eye.fr.zoreil.com> <20040823224425.GA20726@electric-eye.fr.zoreil.com> <20040823224548.GB20726@electric-eye.fr.zoreil.com> <20040823224706.GC20726@electric-eye.fr.zoreil.com> <20040823224813.GD20726@electric-eye.fr.zoreil.com> <20040823224927.GE20726@electric-eye.fr.zoreil.com> <20040823225120.GF20726@electric-eye.fr.zoreil.com> <20040823225335.GG20726@electric-eye.fr.zoreil.com> <20040823225505.GH20726@electric-eye.fr.zoreil.com> |
| Sender: | netdev-bounce@xxxxxxxxxxx |
| User-agent: | Mutt/1.4.1i |
Advertise the ability to DMA to high memory.
Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
diff -puN drivers/net/r8169.c~r8169-090 drivers/net/r8169.c
--- linux-2.6.8.1/drivers/net/r8169.c~r8169-090 2004-08-23 23:30:06.000000000
+0200
+++ linux-2.6.8.1-fr/drivers/net/r8169.c 2004-08-23 23:30:06.000000000
+0200
@@ -1029,10 +1029,10 @@ rtl8169_init_board(struct pci_dev *pdev,
tp->cp_cmd = PCIMulRW | RxChkSum;
- if ((sizeof(dma_addr_t) > 32) &&
- !pci_set_dma_mask(pdev, DMA_64BIT_MASK))
+ if ((sizeof(dma_addr_t) > 32) && !pci_set_dma_mask(pdev,
DMA_64BIT_MASK)) {
tp->cp_cmd |= PCIDAC;
- else {
+ dev->features |= NETIF_F_HIGHDMA;
+ } else {
rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (rc < 0) {
printk(KERN_ERR PFX "DMA configuration failed.\n");
@@ -1040,7 +1040,6 @@ rtl8169_init_board(struct pci_dev *pdev,
}
}
-
pci_set_master(pdev);
// ioremap MMIO region
_
|
| Previous by Date: | [PATCH 2.6.8.1-mm4 6/11] r8169: sync the names of a few bits with the 8139cp driver, Francois Romieu |
|---|---|
| Next by Date: | [PATCH 2.6.8.1-mm4 8/11] r8169: Tx checksum offload, Francois Romieu |
| Previous by Thread: | [PATCH 2.6.8.1-mm4 8/11] r8169: Tx checksum offload, Francois Romieu |
| Next by Thread: | [PATCH 2.6.8.1-mm4 10/11] r8169: Rx checksum support, Francois Romieu |
| Indexes: | [Date] [Thread] [Top] [All Lists] |