diff options
Diffstat (limited to 'linux/src/drivers/net')
| -rw-r--r-- | linux/src/drivers/net/3c507.c | 3 | ||||
| -rw-r--r-- | linux/src/drivers/net/hp100.c | 5 | ||||
| -rw-r--r-- | linux/src/drivers/net/ne2k-pci.c | 8 |
3 files changed, 10 insertions, 6 deletions
diff --git a/linux/src/drivers/net/3c507.c b/linux/src/drivers/net/3c507.c index 6005487..63f85a4 100644 --- a/linux/src/drivers/net/3c507.c +++ b/linux/src/drivers/net/3c507.c @@ -71,6 +71,8 @@ static unsigned int net_debug = NET_DEBUG; static unsigned int netcard_portlist[] = { 0x300, 0x320, 0x340, 0x280, 0}; +static void init_rx_bufs(struct device *dev); + /* Details of the i82586. @@ -589,7 +591,6 @@ el16_interrupt(int irq, void *dev_id, struct pt_regs *regs) } if ((status & 0x0070) != 0x0040 && dev->start) { - static void init_rx_bufs(struct device *); /* The Rx unit is not ready, it must be hung. Restart the receiver by initializing the rx buffers, and issuing an Rx start command. */ if (net_debug) diff --git a/linux/src/drivers/net/hp100.c b/linux/src/drivers/net/hp100.c index 2e4f804..0b86ef4 100644 --- a/linux/src/drivers/net/hp100.c +++ b/linux/src/drivers/net/hp100.c @@ -2,7 +2,7 @@ ** hp100.c ** HP CASCADE Architecture Driver for 100VG-AnyLan Network Adapters ** -** $Id: hp100.c,v 1.1 1999/04/26 05:52:18 tb Exp $ +** $Id: hp100.c,v 1.1.4.1 2005/06/02 18:52:39 ams Exp $ ** ** Based on the HP100 driver written by Jaroslav Kysela <perex@jcu.cz> ** Extended for new busmaster capable chipsets by @@ -648,8 +648,7 @@ __initfunc(static int hp100_probe1( struct device *dev, int ioaddr, u_char bus, { mem_ptr_phys = (u_int *)( hp100_inw( MEM_MAP_LSW ) | ( hp100_inw( MEM_MAP_MSW ) << 16 ) ); - (u_int)mem_ptr_phys &= ~0x1fff; /* 8k alignment */ - + mem_ptr_phys = (u_int *) ((u_int) mem_ptr_phys & ~0x1fff); /* 8k alignment */ if ( bus == HP100_BUS_ISA && ( (u_long)mem_ptr_phys & ~0xfffff ) != 0 ) { printk("hp100: %s: Can only use programmed i/o mode.\n", dev->name); diff --git a/linux/src/drivers/net/ne2k-pci.c b/linux/src/drivers/net/ne2k-pci.c index 3aa556f..bdc3e74 100644 --- a/linux/src/drivers/net/ne2k-pci.c +++ b/linux/src/drivers/net/ne2k-pci.c @@ -542,7 +542,10 @@ ne_block_input(struct device *dev, int count, struct sk_buff *skb, int ring_offs if (count & 3) { buf += count & ~3; if (count & 2) - *((u16*)buf)++ = inw(NE_BASE + NE_DATAPORT); + { + *buf = *(u16 *) buf + 1; + *buf = inw(NE_BASE + NE_DATAPORT); + } if (count & 1) *buf = inb(NE_BASE + NE_DATAPORT); } @@ -605,7 +608,8 @@ ne_block_output(struct device *dev, int count, if (count & 3) { buf += count & ~3; if (count & 2) - outw(*((u16*)buf)++, NE_BASE + NE_DATAPORT); + outw(*buf++, NE_BASE + NE_DATAPORT); + } #else outsw(NE_BASE + NE_DATAPORT, buf, count>>1); |