Merge with Linux 2.4.0-test6-pre7.

5 files changed, 13 insertions, 7 deletions

diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c
index 950bd016c..255d845fd 100644
--- a/drivers/net/appletalk/cops.c
+++ b/drivers/net/appletalk/cops.c
@@ -772,6 +772,7 @@ static void cops_rx(struct net_device *dev)
                 if(boguscount==1000000)
                 {
                         printk(KERN_WARNING "%s: DMA timed out.\n",dev->name);
+			restore_flags(flags);
                         return;
                 }
         }
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index db89a18f6..233b1e4d3 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -2252,8 +2252,10 @@ static struct pci_driver eepro100_driver = {
 	id_table:	eepro100_pci_tbl,
 	probe:		eepro100_init_one,
 	remove:		eepro100_remove_one,
+#if 0	/* These seem to be broken.. */
 	suspend:	eepro100_suspend,
 	resume:		eepro100_resume,
+#endif
 };
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,48)
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index 8e95f0a05..637b02460 100644
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -2406,8 +2406,7 @@ SK_EVPARA 	EvPara;
 	SkEventDispatcher(pAC, pAC->IoBase);
 
 	for (i=0; i<pAC->GIni.GIMacsFound; i++) {
-		spin_lock_irqsave(
-			&pAC->TxPort[i][TX_PRIO_LOW].TxDesRingLock, Flags);
+		spin_lock(&pAC->TxPort[i][TX_PRIO_LOW].TxDesRingLock);
 	}
 	netif_stop_queue(pAC->dev);
 
@@ -2500,8 +2499,7 @@ SK_EVPARA 	EvPara;
 
 	netif_start_queue(pAC->dev);
 	for (i=pAC->GIni.GIMacsFound-1; i>=0; i--) {
-		spin_unlock_irqrestore(
-			&pAC->TxPort[i][TX_PRIO_LOW].TxDesRingLock, Flags);
+		spin_unlock(&pAC->TxPort[i][TX_PRIO_LOW].TxDesRingLock);
 	}
 
 	/* enable Interrupts */
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 51e2d6494..7420e5691 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -1260,8 +1260,10 @@ static int sl_ioctl(struct net_device *dev,struct ifreq *rq,int cmd)
 	switch(cmd){
         case SIOCSKEEPALIVE:
 		/* max for unchar */
-                if (((unsigned int)((unsigned long)rq->ifr_data)) > 255)
+                if (((unsigned int)((unsigned long)rq->ifr_data)) > 255) {
+			spin_unlock_bh(&sl->lock);
 			return -EINVAL;
+		}
 		sl->keepalive = (unchar) ((unsigned long)rq->ifr_data);
 		if (sl->keepalive != 0) {
 			sl->keepalive_timer.expires=jiffies+sl->keepalive*HZ;
@@ -1270,7 +1272,6 @@ static int sl_ioctl(struct net_device *dev,struct ifreq *rq,int cmd)
                 } else {
                         del_timer(&sl->keepalive_timer);
 		}
-		spin_unlock_bh(&sl->lock);
 		break;
 
         case SIOCGKEEPALIVE:
@@ -1278,8 +1279,10 @@ static int sl_ioctl(struct net_device *dev,struct ifreq *rq,int cmd)
 		break;
 
         case SIOCSOUTFILL:
-                if (((unsigned)((unsigned long)rq->ifr_data)) > 255) /* max for unchar */
+                if (((unsigned)((unsigned long)rq->ifr_data)) > 255) { /* max for unchar */
+			spin_unlock_bh(&sl->lock);
 			return -EINVAL;
+		}
                 if ((sl->outfill = (unchar)((unsigned long) rq->ifr_data)) != 0){
 			mod_timer(&sl->outfill_timer, jiffies+sl->outfill*HZ);
 			set_bit(SLF_OUTWAIT, &sl->flags);
diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
index 371153a47..f7f3fe58a 100644
--- a/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile
@@ -76,10 +76,12 @@ endif
 ifeq ($(CONFIG_COMX_HW_LOCOMX),y)
 L_OBJS += comx-hw-locomx.o
 CONFIG_85230_BUILTIN=y
+CONFIG_SYNCPPP_BUILTIN = y
 else 
   ifeq ($(CONFIG_COMX_HW_LOCOMX),m)
   M_OBJS += comx-hw-locomx.o
   CONFIG_85230_MODULE=y
+  CONFIG_SYNCPPP_MODULE = y
   endif
 endif