patch-2.4.23 linux-2.4.23/drivers/net/starfire.c
Next file: linux-2.4.23/drivers/net/sungem.c
Previous file: linux-2.4.23/drivers/net/sonic.c
Back to the patch index
Back to the overall index
- Lines: 27
- Date:
2003-11-28 10:26:20.000000000 -0800
- Orig file:
linux-2.4.22/drivers/net/starfire.c
- Orig date:
2003-06-13 07:51:35.000000000 -0700
diff -urN linux-2.4.22/drivers/net/starfire.c linux-2.4.23/drivers/net/starfire.c
@@ -130,6 +130,7 @@
#include <linux/config.h>
#include <linux/version.h>
#include <linux/module.h>
+#include <asm/io.h>
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/netdevice.h>
@@ -1121,15 +1122,9 @@
TX_DESC_SPACING | TX_DESC_TYPE,
ioaddr + TxDescCtrl);
-#if defined(ADDR_64BITS)
- writel(np->queue_mem_dma >> 32, ioaddr + RxDescQHiAddr);
- writel(np->queue_mem_dma >> 32, ioaddr + TxRingHiAddr);
- writel(np->queue_mem_dma >> 32, ioaddr + CompletionHiAddr);
-#else
- writel(0, ioaddr + RxDescQHiAddr);
- writel(0, ioaddr + TxRingHiAddr);
- writel(0, ioaddr + CompletionHiAddr);
-#endif
+ writel( (np->queue_mem_dma >> 16) >> 16, ioaddr + RxDescQHiAddr);
+ writel( (np->queue_mem_dma >> 16) >> 16, ioaddr + TxRingHiAddr);
+ writel( (np->queue_mem_dma >> 16) >> 16, ioaddr + CompletionHiAddr);
writel(np->rx_ring_dma, ioaddr + RxDescQAddr);
writel(np->tx_ring_dma, ioaddr + TxRingPtr);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)