X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fmultilink.c;h=23f0fa084962a4ffb7baa345919f58b9b2ab6068;hb=26703b215b0b68d7005e6b5e41d744101471a743;hp=81528bb23a1a069f6965e7ca528a4168f0f35637;hpb=8e950ea70924467a81ecb8411d5fc5932ccc2f23;p=ppp.git

diff --git a/pppd/multilink.c b/pppd/multilink.c
index 81528bb..23f0fa0 100644
--- a/pppd/multilink.c
+++ b/pppd/multilink.c
@@ -95,7 +95,11 @@ mp_join_bundle()
 		/* not doing multilink */
 		if (go->neg_mrru)
 			notice("oops, multilink negotiated only for receive");
-		multilink = 0;
+		if (demand) {
+			/* already have a bundle */
+			cfg_bundle(0, 0, 0, 0);
+			return 0;
+		}
 		make_new_bundle(0, 0, 0, 0);
 		set_ifunit(1);
 		return 0;
@@ -125,7 +129,6 @@ mp_join_bundle()
 			      epdisc_to_str(&ho->endpoint));
 	if (bundle_name)
 		p += slprintf(p, bundle_id+l-p, "/%v", bundle_name);
-	dbglog("bundle_id = %s", bundle_id+7);
 
 	/*
 	 * For demand mode, we only need to configure the bundle
@@ -356,12 +359,10 @@ str_to_epdisc(ep, str)
 		if (i == 0 || str[i] != 0)
 			return 0;
 		set_ip_epdisc(ep, addr);
-		dbglog("str_to_epdisc -> %s", epdisc_to_str(ep));
 		return 1;
 	}
 	if (i == EPD_MAC && get_if_hwaddr(ep->value, str) >= 0) {
 		ep->length = 6;
-		dbglog("str_to_epdisc -> %s", epdisc_to_str(ep));
 		return 1;
 	}
 
@@ -384,7 +385,6 @@ str_to_epdisc(ep, str)
 	if (*str != 0 || (ep->class == EPD_MAC && l != 6))
 		return 0;
 	ep->length = l;
-	dbglog("str_to_epdisc -> %s", epdisc_to_str(ep));
 	return 1;
 }