patch-2.1.103 linux/drivers/isdn/isdn_net.c

Next file: linux/drivers/net/hamradio/dmascc.c
Previous file: linux/drivers/isdn/hisax/teles3.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.102/linux/drivers/isdn/isdn_net.c linux/drivers/isdn/isdn_net.c
@@ -431,7 +431,7 @@
 		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_hangup(&p->dev);
 				} else if (l->hupflags & ISDN_INHUP)
 					isdn_net_hangup(&p->dev);
+			}
 		}
 		p = (isdn_net_dev *) p->next;
 	}
@@ -792,11 +793,12 @@
 				 * 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:

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov