Module Name: src
Committed By: knakahara
Date: Fri Aug 12 06:24:03 UTC 2022
Modified Files:
src/sys/net: if_pppoe.c
Log Message:
Fix stall on PPPOE_STATE_PADR_SENT when received specific PADO, ok'ed by
yamaguchi@n.o.
When pppoe receives a PADO frame larger than mbuf cluster size,
pppoe_send_padr() fails forever. So, the pppoe interface stall
on PPPOE_STATE_PADR_SENT until ifconfig down/up.
It should retry from PADI in such case.
To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.182 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.181 src/sys/net/if_pppoe.c:1.182
--- src/sys/net/if_pppoe.c:1.181 Mon May 23 21:46:12 2022
+++ src/sys/net/if_pppoe.c Fri Aug 12 06:24:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.181 2022/05/23 21:46:12 andvar Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.182 2022/08/12 06:24:03 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.181 2022/05/23 21:46:12 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.182 2022/08/12 06:24:03 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "pppoe.h"
@@ -1615,7 +1615,6 @@ pppoe_timeout(struct pppoe_softc *sc)
return;
}
if ((err = pppoe_send_padr(sc)) != 0) {
- sc->sc_padr_retried--;
pppoe_printf(sc,"failed to send PADR, error=%d", err);
}
callout_schedule(&sc->sc_timeout,
