[src/netbsd-8]: src/sys/net Pull up following revision(s) (requested by knaka...

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

details:   https://anonhg.NetBSD.org/src/rev/56e8b2c79d50
branches:  netbsd-8
changeset: 434150:56e8b2c79d50
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Jul 25 02:07:11 2017 +0000

description:
Pull up following revision(s) (requested by knakahara in ticket #149):
        sys/net/if_pppoe.c: revision 1.126
fix panic when PPPOE_DEBUG enabled. implemented by s-yamaguchi@IIJ, thanks.

diffstat:

 sys/net/if_pppoe.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 504c5cf7f7e1 -r 56e8b2c79d50 sys/net/if_pppoe.c
--- a/sys/net/if_pppoe.c        Tue Jul 25 02:06:10 2017 +0000
+++ b/sys/net/if_pppoe.c        Tue Jul 25 02:07:11 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.125 2017/02/07 02:33:54 ozaki-r Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.125.6.1 2017/07/25 02:07:11 snj Exp $ */
 
 /*-
  * Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.125 2017/02/07 02:33:54 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.125.6.1 2017/07/25 02:07:11 snj Exp $");
 
 #ifdef _KERNEL_OPT
 #include "pppoe.h"
@@ -1366,7 +1366,6 @@
        }
 
 #ifdef PPPOE_DEBUG
-       p += sizeof sc;
        if (p - mtod(m0, uint8_t *) != len + PPPOE_HEADERLEN)
                panic("pppoe_send_padi: garbled output len, should be %ld, is %ld",
                    (long)(len + PPPOE_HEADERLEN), (long)(p - mtod(m0, uint8_t *)));
@@ -1666,7 +1665,6 @@
        }
 
 #ifdef PPPOE_DEBUG
-       p += sizeof sc;
        if (p - mtod(m0, uint8_t *) != len + PPPOE_HEADERLEN)
                panic("pppoe_send_padr: garbled output len, should be %ld, is %ld",
                        (long)(len + PPPOE_HEADERLEN), (long)(p - mtod(m0, uint8_t *)));