[src/netbsd-1-6]: src/sys/net Pull up revision 1.47 (requested by martin in t...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a912e5044d58
branches:  netbsd-1-6
changeset: 530017:a912e5044d58
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Feb 07 18:12:11 2003 +0000

description:
Pull up revision 1.47 (requested by martin in ticket #1152):
don't panic on invalid CONF_ACK from remote (in general, issueing panic
on remote input is bad practice)

diffstat:

 sys/net/if_spppsubr.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r ad705856e8bb -r a912e5044d58 sys/net/if_spppsubr.c
--- a/sys/net/if_spppsubr.c     Mon Feb 03 05:24:12 2003 +0000
+++ b/sys/net/if_spppsubr.c     Fri Feb 07 18:12:11 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_spppsubr.c,v 1.46.4.6 2003/01/28 18:28:12 jmc Exp $  */
+/*     $NetBSD: if_spppsubr.c,v 1.46.4.7 2003/02/07 18:12:11 tron Exp $         */
 
 /*
  * Synchronous PPP/Cisco link level subroutines.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.46.4.6 2003/01/28 18:28:12 jmc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.46.4.7 2003/02/07 18:12:11 tron Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipx.h"
@@ -3407,7 +3407,7 @@
                        addlog(" send %s\n", sppp_cp_type_name(type));
                sppp_cp_send (sp, PPP_IPV6CP, type, h->ident, origlen, h+1);
        } else {
-#ifdef DIAGNOSTIC
+#ifdef notdef
                if (type == CONF_ACK)
                        panic("IPv6CP RCR: CONF_ACK with non-zero rlen");
 #endif