Commit 0df36a32 authored by Jeff Garzik's avatar Jeff Garzik

Merge pobox.com:/garz/repo/linux-2.6

into pobox.com:/garz/repo/net-drivers-2.6
parents d1370cf6 a535d480
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
#include <linux/udp.h> #include <linux/udp.h>
#include <linux/cache.h> #include <linux/cache.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
/* VLAN tagging feature enable/disable */ /* VLAN tagging feature enable/disable */
......
...@@ -1222,10 +1222,10 @@ static int InitRestartDepca(struct net_device *dev) ...@@ -1222,10 +1222,10 @@ static int InitRestartDepca(struct net_device *dev)
/* clear IDON by writing a "1", enable interrupts and start lance */ /* clear IDON by writing a "1", enable interrupts and start lance */
outw(IDON | INEA | STRT, DEPCA_DATA); outw(IDON | INEA | STRT, DEPCA_DATA);
if (depca_debug > 2) { if (depca_debug > 2) {
printk("%s: DEPCA open after %d ticks, init block 0x%08lx csr0 %4.4x.\n", dev->name, i, virt_to_phys(lp->sh_mem), inw(DEPCA_DATA)); printk("%s: DEPCA open after %d ticks, init block 0x%08lx csr0 %4.4x.\n", dev->name, i, lp->mem_start, inw(DEPCA_DATA));
} }
} else { } else {
printk("%s: DEPCA unopen after %d ticks, init block 0x%08lx csr0 %4.4x.\n", dev->name, i, virt_to_phys(lp->sh_mem), inw(DEPCA_DATA)); printk("%s: DEPCA unopen after %d ticks, init block 0x%08lx csr0 %4.4x.\n", dev->name, i, lp->mem_start, inw(DEPCA_DATA));
status = -1; status = -1;
} }
...@@ -1901,7 +1901,7 @@ static void depca_dbg_open(struct net_device *dev) ...@@ -1901,7 +1901,7 @@ static void depca_dbg_open(struct net_device *dev)
} }
} }
printk("...0x%8.8x\n", readl(&lp->tx_ring[i].base)); printk("...0x%8.8x\n", readl(&lp->tx_ring[i].base));
printk("Initialisation block at 0x%8.8lx(Phys)\n", virt_to_phys(lp->sh_mem)); printk("Initialisation block at 0x%8.8lx(Phys)\n", lp->mem_start);
printk(" mode: 0x%4.4x\n", p->mode); printk(" mode: 0x%4.4x\n", p->mode);
printk(" physical address: "); printk(" physical address: ");
for (i = 0; i < ETH_ALEN - 1; i++) { for (i = 0; i < ETH_ALEN - 1; i++) {
...@@ -1915,7 +1915,7 @@ static void depca_dbg_open(struct net_device *dev) ...@@ -1915,7 +1915,7 @@ static void depca_dbg_open(struct net_device *dev)
printk("%2.2x\n", p->mcast_table[i]); printk("%2.2x\n", p->mcast_table[i]);
printk(" rx_ring at: 0x%8.8x\n", p->rx_ring); printk(" rx_ring at: 0x%8.8x\n", p->rx_ring);
printk(" tx_ring at: 0x%8.8x\n", p->tx_ring); printk(" tx_ring at: 0x%8.8x\n", p->tx_ring);
printk("buffers (Phys): 0x%8.8lx\n", virt_to_phys(lp->sh_mem) + lp->buffs_offset); printk("buffers (Phys): 0x%8.8lx\n", lp->mem_start + lp->buffs_offset);
printk("Ring size:\nRX: %d Log2(rxRingMask): 0x%8.8x\n", (int) lp->rxRingMask + 1, lp->rx_rlen); printk("Ring size:\nRX: %d Log2(rxRingMask): 0x%8.8x\n", (int) lp->rxRingMask + 1, lp->rx_rlen);
printk("TX: %d Log2(txRingMask): 0x%8.8x\n", (int) lp->txRingMask + 1, lp->tx_rlen); printk("TX: %d Log2(txRingMask): 0x%8.8x\n", (int) lp->txRingMask + 1, lp->tx_rlen);
outw(CSR2, DEPCA_ADDR); outw(CSR2, DEPCA_ADDR);
......
...@@ -1606,7 +1606,7 @@ static void streamer_arb_cmd(struct net_device *dev) ...@@ -1606,7 +1606,7 @@ static void streamer_arb_cmd(struct net_device *dev)
i += 2; i += 2;
} }
memcpy_fromio(skb_put(mac_frame, buffer_len), memcpy(skb_put(mac_frame, buffer_len),
frame_data, buffer_len); frame_data, buffer_len);
} while (next_ptr && (buff_off = next_ptr)); } while (next_ptr && (buff_off = next_ptr));
......
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/irq.h>
/* Board/System/Debug information/definition ---------------- */ /* Board/System/Debug information/definition ---------------- */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment