VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / drivers / net / hp-plus.c

diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c
index 0e60de8..4b6c01a 100644 (file)
--- a/drivers/net/hp-plus.c
+++ b/drivers/net/hp-plus.c
@@ -37,6 +37,8 @@ static const char version[] =
 
 #include "8390.h"
 
+#define DRV_NAME "hp-plus"
+
 /* A zero-terminated list of I/O addresses to be probed. */
 static unsigned int hpplus_portlist[] __initdata =
 {0x200, 0x240, 0x280, 0x2C0, 0x300, 0x320, 0x340, 0};
@@ -142,6 +144,7 @@ static void cleanup_card(struct net_device *dev)
        release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT);
 }
 
+#ifndef MODULE
 struct net_device * __init hp_plus_probe(int unit)
 {
        struct net_device *dev = alloc_ei_netdev();
@@ -166,6 +169,7 @@ out:
        free_netdev(dev);
        return ERR_PTR(err);
 }
+#endif
 
 /* Do the interesting part of the probe at a single address. */
 static int __init hpp_probe1(struct net_device *dev, int ioaddr)
@@ -176,7 +180,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
        int mem_start;
        static unsigned version_printed;
 
-       if (!request_region(ioaddr, HP_IO_EXTENT, dev->name))
+       if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME))
                return -EBUSY;
 
        /* Check for the HP+ signature, 50 48 0x 53. */
@@ -229,7 +233,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
        }
 
        /* Set the wrap registers for string I/O reads.   */
-       outw((HP_START_PG + TX_2X_PAGES) | ((HP_STOP_PG - 1) << 8), ioaddr + 14);
+       outw((HP_START_PG + TX_PAGES/2) | ((HP_STOP_PG - 1) << 8), ioaddr + 14);
 
        /* Set the base address to point to the NIC, not the "real" base! */
        dev->base_addr = ioaddr + NIC_OFFSET;
@@ -243,7 +247,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
        ei_status.name = name;
        ei_status.word16 = 0;           /* Agggghhhhh! Debug time: 2 days! */
        ei_status.tx_start_page = HP_START_PG;
-       ei_status.rx_start_page = HP_START_PG + TX_2X_PAGES;
+       ei_status.rx_start_page = HP_START_PG + TX_PAGES/2;
        ei_status.stop_page = HP_STOP_PG;
 
        ei_status.reset_8390 = &hpp_reset_8390;
@@ -257,7 +261,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
                ei_status.block_output = &hpp_mem_block_output;
                ei_status.get_8390_hdr = &hpp_mem_get_8390_hdr;
                dev->mem_start = mem_start;
-               ei_status.rmem_start = dev->mem_start + TX_2X_PAGES*256;
+               ei_status.rmem_start = dev->mem_start + TX_PAGES/2*256;
                dev->mem_end = ei_status.rmem_end
                        = dev->mem_start + (HP_STOP_PG - HP_START_PG)*256;
        }
@@ -293,7 +297,7 @@ hpp_open(struct net_device *dev)
 
        /* Set the wrap registers for programmed-I/O operation.   */
        outw(HW_Page, ioaddr + HP_PAGING);
-       outw((HP_START_PG + TX_2X_PAGES) | ((HP_STOP_PG - 1) << 8), ioaddr + 14);
+       outw((HP_START_PG + TX_PAGES/2) | ((HP_STOP_PG - 1) << 8), ioaddr + 14);
 
        /* Select the operational page. */
        outw(Perf_Page, ioaddr + HP_PAGING);