Merge with Linu 2.4.0-test6-pre6.

11 files changed, 8 insertions, 11 deletions

diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index 7fa0bb8e1..6a458a39c 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -706,8 +706,10 @@ static int init_i596_mem(struct net_device *dev)
 
 	spin_lock_irqsave (&lp->lock, flags);
 
-	if (wait_cmd(dev,lp,1000,"timed out waiting to issue RX_START"))
+	if (wait_cmd(dev,lp,1000,"timed out waiting to issue RX_START")) {
+		spin_unlock_irqrestore ((&lp->lock, flags);
 		goto failed;
+	}
 	DEB(DEB_INIT,printk("%s: Issuing RX_START\n", dev->name));
 	lp->scb.command = RX_START;
 	CA(dev);
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 006cb2a8a..e5ac867a6 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -21,7 +21,6 @@ ALL_SUB_DIRS := $(SUB_DIRS) fc hamradio irda pcmcia tokenring wan sk98lin \
 		arcnet skfp tulip appletalk
 
 O_TARGET := net.o
-MOD_LIST_NAME := NET_MODULES
 
 # All of the (potential) objects that export symbols.
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index d1a6be95c..6acc28597 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -557,7 +557,8 @@ static void net_tx_timeout (struct net_device *dev)
 	/* ToDo: We should try to restart the adaptor... */
 	outw (0xffff, ioaddr + 24);
 	outw (0xffff, ioaddr + TX_STATUS);
-	outw (0xe85a, ioaddr + CONFIG_0);
+	outb (0x5a, ioaddr + CONFIG_0);
+	outb (0xe8, ioaddr + CONFIG_1);
 	outw (0x8182, ioaddr + TX_INTR);
 	outb (0x00, ioaddr + TX_START);
 	outb (0x03, ioaddr + COL16CNTL);
diff --git a/drivers/net/fc/Makefile b/drivers/net/fc/Makefile
index 6fd921f52..87e599863 100644
--- a/drivers/net/fc/Makefile
+++ b/drivers/net/fc/Makefile
@@ -10,7 +10,6 @@ L_TARGET := fc.a
 L_OBJS   := 
 M_OBJS   := 
 MX_OBJS  := 
-MOD_LIST_NAME := FC_MODULES
 FC_SRCS = $(wildcard $(L_OBJS:%.o=%.c))
 
 ifeq ($(CONFIG_IPHASE5526),y)
diff --git a/drivers/net/fc/iph5526.c b/drivers/net/fc/iph5526.c
index 309a2c42d..8d4ebe1a3 100644
--- a/drivers/net/fc/iph5526.c
+++ b/drivers/net/fc/iph5526.c
@@ -3952,8 +3952,10 @@ u_long flags;
 
 	/* Get an used OX_ID. We could have pending commands.
 	 */
-	if (get_scsi_oxid(fi))
+	if (get_scsi_oxid(fi)) {
+		spin_unlock_irqrestore(&fi->fc_lock, flags);
 		return 1;
+	}
 	fi->q.free_scsi_oxid[fi->g.scsi_oxid] = OXID_INUSE;	
 
 	/* Maintain a handler so that we can associate the done() function
diff --git a/drivers/net/hamradio/Makefile b/drivers/net/hamradio/Makefile
index d80857838..c2fb726c3 100644
--- a/drivers/net/hamradio/Makefile
+++ b/drivers/net/hamradio/Makefile
@@ -14,7 +14,6 @@ ALL_SUB_DIRS := $(SUB_DIRS)
 O_TARGET := hamradio.o
 O_OBJS   := 
 M_OBJS   :=
-MOD_LIST_NAME := HAM_MODULES
 
 # Need these to keep track of whether the hdlc module should
 # really go in the kernel or a module.
diff --git a/drivers/net/irda/Makefile b/drivers/net/irda/Makefile
index d9989aa1a..53ee8867c 100644
--- a/drivers/net/irda/Makefile
+++ b/drivers/net/irda/Makefile
@@ -10,7 +10,6 @@ ALL_SUB_DIRS := $(SUB_DIRS)
 L_TARGET := irda_drivers.a
 L_OBJS   := 
 M_OBJS   :=
-MOD_LIST_NAME := IRDA_DRIVERS_MODULES
 
 ifeq ($(CONFIG_IRTTY_SIR),y)
 L_OBJS += irtty.o
diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile
index 4f6463c22..acb40aa1b 100644
--- a/drivers/net/pcmcia/Makefile
+++ b/drivers/net/pcmcia/Makefile
@@ -9,7 +9,6 @@ MOD_SUB_DIRS := $(SUB_DIRS)
 ALL_SUB_DIRS := $(SUB_DIRS)
 
 O_TARGET := pcmcia_net.o
-MOD_LIST_NAME := PCMCIA_NET_MODULES
 
 obj-y		:=
 obj-m		:=
diff --git a/drivers/net/sk98lin/Makefile b/drivers/net/sk98lin/Makefile
index 7dfe263be..fbf1a6d6b 100644
--- a/drivers/net/sk98lin/Makefile
+++ b/drivers/net/sk98lin/Makefile
@@ -10,7 +10,6 @@ ifeq ($(CONFIG_SK98LIN),y)
              skxmac2.o skcsum.o
 else
   ifeq ($(CONFIG_SK98LIN),m)
-    MOD_LIST_NAME := SK98LIN_MODULES
     M_OBJS := sk98lin.o
     O_TARGET := sk98lin.o
     O_OBJS = skge.o skaddr.o skgehwt.o skgeinit.o skgepnmi.o skgesirq.o \
diff --git a/drivers/net/skfp/Makefile b/drivers/net/skfp/Makefile
index 82aa26e4c..5f681ca17 100644
--- a/drivers/net/skfp/Makefile
+++ b/drivers/net/skfp/Makefile
@@ -10,7 +10,6 @@ ifeq ($(CONFIG_SKFP),y)
               smtparse.o  hwt.o      drvfbi.o   ess.o
 else
   ifeq ($(CONFIG_SKFP),m)
-    MOD_LIST_NAME := SKFP_MODULES
     M_OBJS := skfp.o
     O_TARGET := skfp.o
     O_OBJS =  skfddi.o    hwmtm.o    fplustm.o  smt.o      cfm.o     \
diff --git a/drivers/net/wan/lmc/Makefile b/drivers/net/wan/lmc/Makefile
index 1fe61a348..fbfd22489 100644
--- a/drivers/net/wan/lmc/Makefile
+++ b/drivers/net/wan/lmc/Makefile
@@ -9,7 +9,6 @@ ifeq ($(CONFIG_LANMEDIA),y)
     O_OBJS = lmc_debug.o lmc_media.o lmc_main.o lmc_proto.o
 else
   ifeq ($(CONFIG_LANMEDIA),m)
-    MOD_LIST_NAME := NET_MODULES
     M_OBJS := lmc.o
     O_TARGET := lmc.o
     O_OBJS = lmc_debug.o lmc_media.o lmc_main.o lmc_proto.o