Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/net Remove deleted interfaces from the instance list (in...



details:   https://anonhg.NetBSD.org/src/rev/8b02272fd792
branches:  trunk
changeset: 573097:8b02272fd792
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Jan 19 15:05:55 2005 +0000

description:
Remove deleted interfaces from the instance list (inspired by an OpenBSD
change). While there, fix a comment.

diffstat:

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

diffs (35 lines):

diff -r 43b7efe3ec3b -r 8b02272fd792 sys/net/if_pppoe.c
--- a/sys/net/if_pppoe.c        Wed Jan 19 14:59:08 2005 +0000
+++ b/sys/net/if_pppoe.c        Wed Jan 19 15:05:55 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.57 2004/12/08 07:43:29 martin Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.58 2005/01/19 15:05:55 martin Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.57 2004/12/08 07:43:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.58 2005/01/19 15:05:55 martin Exp $");
 
 #include "pppoe.h"
 #include "bpfilter.h"
@@ -281,6 +281,7 @@
 {
        struct pppoe_softc * sc = ifp->if_softc;
 
+       callout_stop(&sc->sc_timeout);
        LIST_REMOVE(sc, sc_list);
 #ifdef PFIL_HOOKS
        if (LIST_EMPTY(&pppoe_softc_list))
@@ -1449,7 +1450,7 @@
 static void
 pppoe_clear_softc(struct pppoe_softc *sc, const char *message)
 {
-       /* stop timer (we might be about to transmit a PADT ourself) */ 
+       /* stop timer */
        callout_stop(&sc->sc_timeout);
        if (sc->sc_sppp.pp_if.if_flags & IFF_DEBUG)
                printf("%s: session 0x%x terminated, %s\n",



Home | Main Index | Thread Index | Old Index