o Merge with Linux 2.1.116.

 o New Newport console code.
 o New G364 console code.

14 files changed, 36 insertions, 21 deletions

diff --git a/drivers/isdn/act2000/act2000_isa.c b/drivers/isdn/act2000/act2000_isa.c
index 078760a0c..76d2b3a6a 100644
--- a/drivers/isdn/act2000/act2000_isa.c
+++ b/drivers/isdn/act2000/act2000_isa.c
@@ -83,9 +83,9 @@ isa_reset(unsigned short portbase)
         found = 0;
         if ((reg = inb(portbase + ISA_COR)) != 0xff) {
                 outb(reg | ISA_COR_RESET, portbase + ISA_COR);
-                udelay(10000);
+                mdelay(10);
                 outb(reg, portbase + ISA_COR);
-                udelay(10000);
+                mdelay(10);
 
                 for (i = 0; i < 16; i++) {
                         if (inb(portbase + ISA_ISR) & ISA_ISR_SERIAL)
diff --git a/drivers/isdn/avmb1/b1pci.c b/drivers/isdn/avmb1/b1pci.c
index 5a31d7992..b5c45acfd 100644
--- a/drivers/isdn/avmb1/b1pci.c
+++ b/drivers/isdn/avmb1/b1pci.c
@@ -87,7 +87,7 @@ int b1pci_init(void)
 
 	printk(KERN_INFO "b1pci: revision %s\n", rev);
 
-	while (dev = pci_find_device(PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_B1, dev)) {
+	while ((dev = pci_find_device(PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_B1, dev))) {
 		unsigned int ioaddr = dev->base_address[1] & PCI_BASE_ADDRESS_IO_MASK;
 		unsigned int irq = dev->irq;
 		printk(KERN_INFO
diff --git a/drivers/isdn/hisax/hfc_2bds0.c b/drivers/isdn/hisax/hfc_2bds0.c
index 734ec8bd3..c42a2bb56 100644
--- a/drivers/isdn/hisax/hfc_2bds0.c
+++ b/drivers/isdn/hisax/hfc_2bds0.c
@@ -1042,7 +1042,7 @@ hfc2bds0_interrupt(struct IsdnCardState *cs, u_char val)
 				del_timer(&cs->dbusytimer);
 			if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags))
 				sched_event_D(cs, D_CLEARBUSY);
-			if (cs->tx_skb)
+			if (cs->tx_skb) {
 				if (cs->tx_skb->len) {
 					if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) {
 						hfc_fill_dfifo(cs);
@@ -1056,6 +1056,7 @@ hfc2bds0_interrupt(struct IsdnCardState *cs, u_char val)
 					cs->tx_cnt = 0;
 					cs->tx_skb = NULL;
 				}
+			}
 			if ((cs->tx_skb = skb_dequeue(&cs->sq))) {
 				cs->tx_cnt = 0;
 				if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) {
diff --git a/drivers/isdn/hisax/hscx_irq.c b/drivers/isdn/hisax/hscx_irq.c
index 64e80e7b2..992ec813b 100644
--- a/drivers/isdn/hisax/hscx_irq.c
+++ b/drivers/isdn/hisax/hscx_irq.c
@@ -219,7 +219,7 @@ hscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx)
 		}
 	}
 	if (val & 0x10) {	/* XPR */
-		if (bcs->hw.hscx.tx_skb)
+		if (bcs->hw.hscx.tx_skb) {
 			if (bcs->hw.hscx.tx_skb->len) {
 				hscx_fill_fifo(bcs);
 				return;
@@ -231,6 +231,7 @@ hscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx)
 				bcs->hw.hscx.count = 0; 
 				bcs->hw.hscx.tx_skb = NULL;
 			}
+		}
 		if ((bcs->hw.hscx.tx_skb = skb_dequeue(&bcs->squeue))) {
 			bcs->hw.hscx.count = 0;
 			test_and_set_bit(BC_FLG_BUSY, &bcs->Flag);
diff --git a/drivers/isdn/hisax/isac.c b/drivers/isdn/hisax/isac.c
index 9a2624ef4..f8458364c 100644
--- a/drivers/isdn/hisax/isac.c
+++ b/drivers/isdn/hisax/isac.c
@@ -305,7 +305,7 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
 			del_timer(&cs->dbusytimer);
 		if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags))
 			isac_sched_event(cs, D_CLEARBUSY);
-		if (cs->tx_skb)
+		if (cs->tx_skb) {
 			if (cs->tx_skb->len) {
 				isac_fill_fifo(cs);
 				goto afterXPR;
@@ -314,6 +314,7 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
 				cs->tx_cnt = 0;
 				cs->tx_skb = NULL;
 			}
+		}
 		if ((cs->tx_skb = skb_dequeue(&cs->sq))) {
 			cs->tx_cnt = 0;
 			isac_fill_fifo(cs);
@@ -348,7 +349,7 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
 			}
 #if ARCOFI_USE
 			if (v1 & 0x08) {
-				if (!cs->mon_rx)
+				if (!cs->mon_rx) {
 					if (!(cs->mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) {
 						if (cs->debug & L1_DEB_WARN)
 							debugl1(cs, "ISAC MON RX out of memory!");
@@ -358,6 +359,7 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
 						goto afterMONR0;
 					} else
 						cs->mon_rxp = 0;
+				}
 				if (cs->mon_rxp >= MAX_MON_FRAME) {
 					cs->mocr &= 0xf0;
 					cs->mocr |= 0x0a;
@@ -379,7 +381,7 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
 			}
 		      afterMONR0:
 			if (v1 & 0x80) {
-				if (!cs->mon_rx)
+				if (!cs->mon_rx) {
 					if (!(cs->mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) {
 						if (cs->debug & L1_DEB_WARN)
 							debugl1(cs, "ISAC MON RX out of memory!");
@@ -389,6 +391,7 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
 						goto afterMONR1;
 					} else
 						cs->mon_rxp = 0;
+				}
 				if (cs->mon_rxp >= MAX_MON_FRAME) {
 					cs->mocr &= 0x0f;
 					cs->mocr |= 0xa0;
diff --git a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c
index eadfa4c8a..824ba16c3 100644
--- a/drivers/isdn/hisax/isdnl2.c
+++ b/drivers/isdn/hisax/isdnl2.c
@@ -650,11 +650,12 @@ l2_got_ua(struct FsmInst *fi, int event, void *arg)
 			FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 4);
 			test_and_set_bit(FLG_T200_RUN, &st->l2.flag);
 		} else {
-			if (!test_and_clear_bit(FLG_L3_INIT, &st->l2.flag))
+			if (!test_and_clear_bit(FLG_L3_INIT, &st->l2.flag)) {
 				if (st->l2.vs != st->l2.va)
 					discard_i_queue(st);
 				else
 					est = 0;
+			}
 			st->l2.vs = 0;
 			st->l2.va = 0;
 			st->l2.vr = 0;
diff --git a/drivers/isdn/hisax/rawhdlc.c b/drivers/isdn/hisax/rawhdlc.c
index 16938bc98..b878cb699 100644
--- a/drivers/isdn/hisax/rawhdlc.c
+++ b/drivers/isdn/hisax/rawhdlc.c
@@ -135,7 +135,7 @@
 #include "rawhdlc.h"
 
 /* There's actually an identical copy of this table in the PPP code
- * (ppp_crc16_table), but I don't want this code dependant on PPP
+ * (ppp_crc16_table), but I don't want this code dependent on PPP
  */
 
 // static 
diff --git a/drivers/isdn/hisax/teles3.c b/drivers/isdn/hisax/teles3.c
index 261d054fb..871b10e4a 100644
--- a/drivers/isdn/hisax/teles3.c
+++ b/drivers/isdn/hisax/teles3.c
@@ -216,12 +216,13 @@ release_io_teles3(struct IsdnCardState *cs)
 	if (cs->typ == ISDN_CTYPE_TELESPCMCIA)
 		release_region(cs->hw.teles3.cfg_reg, 97);
 	else {
-		if (cs->hw.teles3.cfg_reg)
+		if (cs->hw.teles3.cfg_reg) {
 			if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) {
 				release_region(cs->hw.teles3.cfg_reg, 1);
 			} else {
 				release_region(cs->hw.teles3.cfg_reg, 8);
 			}
+		}
 		release_ioregs(cs, 0x7);
 	}
 }
@@ -399,12 +400,13 @@ setup_teles3(struct IsdnCard *card))
 			       CardType[cs->typ],
 			       cs->hw.teles3.isac + 32,
 			       cs->hw.teles3.isac + 64);
-			if (cs->hw.teles3.cfg_reg)
+			if (cs->hw.teles3.cfg_reg) {
 				if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) {
 					release_region(cs->hw.teles3.cfg_reg, 1);
 				} else {
 					release_region(cs->hw.teles3.cfg_reg, 8);
 				}
+			}
 			return (0);
 		} else
 			request_region(cs->hw.teles3.isac + 32, 32, "HiSax isac");
@@ -414,12 +416,13 @@ setup_teles3(struct IsdnCard *card))
 			       CardType[cs->typ],
 			       cs->hw.teles3.hscx[0] + 32,
 			       cs->hw.teles3.hscx[0] + 64);
-			if (cs->hw.teles3.cfg_reg)
+			if (cs->hw.teles3.cfg_reg) {
 				if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) {
 					release_region(cs->hw.teles3.cfg_reg, 1);
 				} else {
 					release_region(cs->hw.teles3.cfg_reg, 8);
 				}
+			}
 			release_ioregs(cs, 1);
 			return (0);
 		} else
@@ -430,12 +433,13 @@ setup_teles3(struct IsdnCard *card))
 			       CardType[cs->typ],
 			       cs->hw.teles3.hscx[1] + 32,
 			       cs->hw.teles3.hscx[1] + 64);
-			if (cs->hw.teles3.cfg_reg)
+			if (cs->hw.teles3.cfg_reg) {
 				if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) {
 					release_region(cs->hw.teles3.cfg_reg, 1);
 				} else {
 					release_region(cs->hw.teles3.cfg_reg, 8);
 				}
+			}
 			release_ioregs(cs, 3);
 			return (0);
 		} else
diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
index 2cc0e17f4..15c767b43 100644
--- a/drivers/isdn/icn/icn.c
+++ b/drivers/isdn/icn/icn.c
@@ -1234,7 +1234,7 @@ icn_writecmd(const u_char * buf, int len, int user, icn_card * card)
 			icn_map_channel(lastmap_card, lastmap_channel);
 		restore_flags(flags);
 		if (len) {
-			udelay(1000);
+			mdelay(1);
 			if (loop++ > 20)
 				break;
 		} else
diff --git a/drivers/isdn/isdn_net.c b/drivers/isdn/isdn_net.c
index 46b460370..e976d0e87 100644
--- a/drivers/isdn/isdn_net.c
+++ b/drivers/isdn/isdn_net.c
@@ -431,7 +431,7 @@ isdn_net_autohup()
 		if ((l->flags & ISDN_NET_CONNECTED) && (!l->dialstate)) {
 			anymore = 1;
 			l->huptimer++;
-			if ((l->onhtime) && (l->huptimer > l->onhtime))
+			if ((l->onhtime) && (l->huptimer > l->onhtime)) {
 				if (l->hupflags & ISDN_MANCHARGE &&
 				    l->hupflags & ISDN_CHARGEHUP) {
 					while (jiffies - l->chargetime > l->chargeint)
@@ -455,6 +455,7 @@ isdn_net_autohup()
 						isdn_net_hangup(&p->dev);
 				} else if (l->hupflags & ISDN_INHUP)
 					isdn_net_hangup(&p->dev);
+			}
 		}
 		p = (isdn_net_dev *) p->next;
 	}
@@ -792,11 +793,12 @@ isdn_net_dial(void)
 				 * If timeout and max retries not
 				 * reached, switch back to state 3.
 				 */
-				if (lp->dtimer++ > ISDN_TIMER_DTIMEOUT10)
+				if (lp->dtimer++ > ISDN_TIMER_DTIMEOUT10) {
 					if (lp->dialretry < lp->dialmax) {
 						lp->dialstate = 3;
 					} else
 						isdn_net_hangup(&p->dev);
+				}
 				anymore = 1;
 				break;
 			case 5:
@@ -1764,6 +1766,8 @@ isdn_net_init(struct device *ndev)
 	ndev->type = ARPHRD_ETHER;
 	ndev->addr_len = ETH_ALEN;
 
+	ndev->tx_queue_len = 10; /* for clients without MPPP 5 is better.  */
+
 	for (i = 0; i < ETH_ALEN; i++)
 		ndev->broadcast[i] = 0xff;
 
diff --git a/drivers/isdn/isdn_x25iface.c b/drivers/isdn/isdn_x25iface.c
index 17d291cdf..c7471d361 100644
--- a/drivers/isdn/isdn_x25iface.c
+++ b/drivers/isdn/isdn_x25iface.c
@@ -4,7 +4,7 @@
  * This module supports a network interface wich provides lapb_sematics
  * -- as defined in ../../Documentation/networking/x25-iface.txt -- to
  * the upper layer and assumes that the lower layer provides a reliable
- * data link service by means of the the concap_device_ops callbacks.
+ * data link service by means of the concap_device_ops callbacks.
  *
  * Only protocol specific stuff goes here. Device specific stuff
  * goes to another -- device related -- concap_proto support source file.
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c
index 0235ccb59..b3fabad2f 100644
--- a/drivers/isdn/isdnloop/isdnloop.c
+++ b/drivers/isdn/isdnloop/isdnloop.c
@@ -909,7 +909,7 @@ isdnloop_parse_cmd(isdnloop_card * card)
 					isdnloop_fake(card->rcard[ch - 1], buf, card->rch[ch - 1] + 1);
 					/* Fall through */
 				case 3:
-					/* si1 does not match, dont alert but start timer */
+					/* si1 does not match, don't alert but start timer */
 					isdnloop_start_ctimer(card, ch - 1);
 					break;
 				case 1:
diff --git a/drivers/isdn/pcbit/layer2.c b/drivers/isdn/pcbit/layer2.c
index 8283b7367..bc1b079a2 100644
--- a/drivers/isdn/pcbit/layer2.c
+++ b/drivers/isdn/pcbit/layer2.c
@@ -721,7 +721,7 @@ pcbit_recv_ack(struct pcbit_dev *dev, unsigned char ack)
 
 	if (unacked) {
 
-		if (dev->send_seq > dev->unack_seq)
+		if (dev->send_seq > dev->unack_seq) {
 			if (ack <= dev->unack_seq || ack > dev->send_seq) {
 				printk(KERN_DEBUG
 				     "layer 2 ack unacceptable - dev %d",
@@ -734,6 +734,7 @@ pcbit_recv_ack(struct pcbit_dev *dev, unsigned char ack)
 				       dev->id);
 				pcbit_l2_error(dev);
 			}
+		}
 		/* ack is acceptable */
 
 
diff --git a/drivers/isdn/pcbit/pcbit.h b/drivers/isdn/pcbit/pcbit.h
index 89a608904..20051bf3e 100644
--- a/drivers/isdn/pcbit/pcbit.h
+++ b/drivers/isdn/pcbit/pcbit.h
@@ -98,7 +98,7 @@ struct pcbit_dev {
 };
 
 #define STATS_TIMER (10*HZ)
-#define ERRTIME     (0.1*HZ)
+#define ERRTIME     (HZ/10)
 
 /* MRU */
 #define MAXBUFSIZE  1534