X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fmultilink.c;h=6d4b4ff44dca8d22e17f542dad26b066d255b16e;hb=ca96eb1c1e8d8c734b6ee013e095914f1e8b081d;hp=c3a782f284662df0fce296d1e83518bd9a654f5f;hpb=cffe80dd87a8ba3fba8f56fda45d2c0cfd62ba4d;p=ppp.git

diff --git a/pppd/multilink.c b/pppd/multilink.c
index c3a782f..6d4b4ff 100644
--- a/pppd/multilink.c
+++ b/pppd/multilink.c
@@ -1,17 +1,36 @@
 /*
  * multilink.c - support routines for multilink.
  *
- * Copyright (c) 2000 Paul Mackerras.
- * All rights reserved.
+ * Copyright (c) 2000-2002 Paul Mackerras. All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms.  The name of the author may not be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The name(s) of the authors of this software must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission.
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by Paul Mackerras
+ *     <paulus@samba.org>".
+ *
+ * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <string.h>
 #include <ctype.h>
@@ -71,9 +90,6 @@ mp_check_options()
 	if (!wo->neg_endpoint && !noendpoint) {
 		/* get a default endpoint value */
 		wo->neg_endpoint = get_default_epdisc(&wo->endpoint);
-		if (wo->neg_endpoint)
-			dbglog("using default endpoint %s",
-			       epdisc_to_str(&wo->endpoint));
 	}
 }
 
@@ -106,8 +122,8 @@ mp_join_bundle()
 			return 0;
 		}
 		make_new_bundle(0, 0, 0, 0);
-		netif_set_mtu(0, mtu);
 		set_ifunit(1);
+		netif_set_mtu(0, mtu);
 		return 0;
 	}
 
@@ -186,8 +202,8 @@ mp_join_bundle()
 
 	/* we have to make a new bundle */
 	make_new_bundle(go->mrru, ho->mrru, go->neg_ssnhf, ho->neg_ssnhf);
-	netif_set_mtu(0, mtu);
 	set_ifunit(1);
+	netif_set_mtu(0, mtu);
 	script_setenv("BUNDLE", bundle_id + 7, 1);
 	tdb_writeunlock(pppdb);
 	info("New bundle %s created", ifname);