Module Name: src
Committed By: snj
Date: Tue Jul 25 02:07:12 UTC 2017
Modified Files:
src/sys/net [netbsd-8]: if_pppoe.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.125.6.1 src/sys/net/if_pppoe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.125 src/sys/net/if_pppoe.c:1.125.6.1
--- src/sys/net/if_pppoe.c:1.125 Tue Feb 7 02:33:54 2017
+++ src/sys/net/if_pppoe.c Tue Jul 25 02:07:11 2017
@@ -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 @@ pppoe_send_padi(struct pppoe_softc *sc)
}
#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 @@ pppoe_send_padr(struct pppoe_softc *sc)
}
#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 *)));
