X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fipcp.c;h=41eabd2192ed0363394a5bc6e611ec80d43dff2f;hb=ade32d2243161da94d757258cd0929a975a6a74c;hp=813bdf3e4aa8502bb5c7b9a560eea201d602a522;hpb=0bcf5992cb3b49b34376c74e53a6d189018cfb44;p=ppp.git

diff --git a/pppd/ipcp.c b/pppd/ipcp.c
index 813bdf3..41eabd2 100644
--- a/pppd/ipcp.c
+++ b/pppd/ipcp.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ipcp.c,v 1.40 1999/03/16 04:00:53 paulus Exp $";
+static char rcsid[] = "$Id: ipcp.c,v 1.43 1999/03/19 04:23:39 paulus Exp $";
 #endif
 
 /*
@@ -183,6 +183,7 @@ struct protent ipcp_protent = {
     NULL,
     1,
     "IPCP",
+    "IP",
     ipcp_option_list,
     ip_check_options,
     ip_demand_conf,
@@ -847,12 +848,9 @@ ipcp_nakci(f, p, len)
 	p = next;
     }
 
-    /* If there is still anything left, this packet is bad. */
-    if (len != 0)
-	goto bad;
-
     /*
      * OK, the Nak is good.  Now we can update state.
+     * If there are any remaining options, we ignore them.
      */
     if (f->state != OPENED)
 	*go = try;
@@ -1522,6 +1520,8 @@ ipcp_down(f)
     fsm *f;
 {
     IPCPDEBUG(("ipcp: down"));
+    if (get_ppp_stats(f->unit, &link_stats))
+	link_stats_valid = 1;
     if (ipcp_is_up) {
 	ipcp_is_up = 0;
 	np_down(f->unit, PPP_IP);