Index: ztcfg.c
===================================================================
RCS file: /usr/cvsroot/zaptel/ztcfg.c,v
retrieving revision 1.20
diff -u -r1.20 ztcfg.c
--- ztcfg.c	10 Jan 2005 04:06:49 -0000	1.20
+++ ztcfg.c	8 Apr 2005 20:54:01 -0000
@@ -1226,6 +1226,9 @@
 							if (errno == EINVAL) {
 								fprintf(stderr, "Did you forget that FXS interfaces are configured with FXO signalling\n"
 									"and that FXO interfaces use FXS signalling?\n");
+							} else if (errno == EISCONN) {
+								/* Don't abort configuring the other channels if this is just a (preexisting) NetHDLC device */
+								continue;
 							}
 							close(fd);
 							exit(1);
Index: zaptel.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.c,v
retrieving revision 1.103
diff -u -r1.103 zaptel.c
--- zaptel.c	15 Jan 2005 22:59:18 -0000	1.103
+++ zaptel.c	8 Apr 2005 20:54:01 -0000
@@ -3066,7 +3066,7 @@
 			if (ztchan_to_dev(chans[ch.chan])->flags & IFF_UP) {
 				spin_unlock_irqrestore(&chans[ch.chan]->lock, flags);
 				printk(KERN_WARNING "Can't switch HDLC net mode on channel %s, since current interface is up\n", chans[ch.chan]->name);
-				return -EBUSY;
+				return -EISCONN;
 			}
 #ifdef LINUX26
 			spin_unlock_irqrestore(&chans[ch.chan]->lock, flags);