X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=mISDN.cpp;h=75a1b62d97fb4755dcb05ec406ca338b992e6217;hp=3961fd82379a329b4ebd96134023b7d8288c604e;hb=92b9d54385a64aa30400d5ccfe6374565bfe8e04;hpb=d19e69fe802e4d4be9fa488a4dd78ff25f0b4479

diff --git a/mISDN.cpp b/mISDN.cpp
index 3961fd8..75a1b62 100644
--- a/mISDN.cpp
+++ b/mISDN.cpp
@@ -37,7 +37,9 @@ struct mISDNport *mISDNport_first;
 unsigned char mISDN_rand[256];
 int mISDN_rand_count = 0;
 
+#ifdef OLD_MT_ASSIGN
 unsigned int mt_assign_pid = ~0;
+#endif
 
 int mISDNsocket = -1;
 static int upqueue_pipe[2];
@@ -1958,7 +1960,7 @@ static int l2establish_timeout(struct lcr_timer *timer, void *instance, int i)
 	struct mISDNport *mISDNport = (struct mISDNport *)instance;
 
 	if (!mISDNport->isloopback && mISDNport->l2hold && (mISDNport->ptp || !mISDNport->ntmode)) {
-//		PDEBUG(DEBUG_ISDN, "the L2 establish timer expired, we try to establish the link portnum=%d.\n", mISDNport->portnum);
+		PDEBUG(DEBUG_ISDN, "the L2 establish timer expired, we try to establish the link portnum=%d.\n", mISDNport->portnum);
 		mISDNport->ml3->to_layer3(mISDNport->ml3, MT_L2ESTABLISH, 0, NULL);
 		schedule_timer(&mISDNport->l2establish, 5, 0); /* 5 seconds */
 	}
@@ -2045,6 +2047,7 @@ int do_layer3(struct mlayer3 *ml3, unsigned int cmd, unsigned int pid, struct l3
 	struct mISDNport *mISDNport = (struct mISDNport *)ml3->priv;
 	struct mbuffer *mb;
 
+#ifdef OLD_MT_ASSIGN
 	/* special MT_ASSIGN handling:
 	 *
 	 * if we request a PID from mlayer, we always do it while lcr is locked.
@@ -2062,6 +2065,7 @@ int do_layer3(struct mlayer3 *ml3, unsigned int cmd, unsigned int pid, struct l3
 		mt_assign_pid = pid;
 		return(0);
 	}
+#endif
 	/* queue message, create, if required */
 	if (!l3m) {
 		l3m = alloc_l3_msg();
@@ -2302,7 +2306,7 @@ struct mISDNport *mISDNport_open(struct interface_port *ifport)
 	if (ss5) {
 		/* try to keep interface enabled */
 		l1hold = 1;
-		l2hold = 1;
+		l2hold = 0;
 	}
 	/* set l2hold */
 	switch (l2hold) {