[src/trunk]: src/sys/net fix panic when PPPOE_DEBUG enabled. implemented by s...

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

details:   https://anonhg.NetBSD.org/src/rev/f04e4b70e3a6
branches:  trunk
changeset: 825532:f04e4b70e3a6
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Thu Jul 20 02:34:24 2017 +0000

description:
fix panic when PPPOE_DEBUG enabled. implemented by s-yamaguchi@IIJ, thanks.

XXX need pullup to -8 branch

diffstat:

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

diffs (34 lines):

diff -r 36cc517830d1 -r f04e4b70e3a6 sys/net/if_pppoe.c
--- a/sys/net/if_pppoe.c        Thu Jul 20 02:27:36 2017 +0000
+++ b/sys/net/if_pppoe.c        Thu Jul 20 02:34:24 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.126 2017/07/20 02:34:24 knakahara 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.126 2017/07/20 02:34:24 knakahara 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 *)));