[src/netbsd-2-0]: src/sys/net Pull up revision 1.115 (requested by dyoung in ...

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

details:   https://anonhg.NetBSD.org/src/rev/859edb94bd2f
branches:  netbsd-2-0
changeset: 561294:859edb94bd2f
user:      jdc <jdc%NetBSD.org@localhost>
date:      Mon Jun 07 06:30:11 2004 +0000

description:
Pull up revision 1.115 (requested by dyoung in ticket #448).

Resolve kern/25721 by detaching ethernet(-like) devices from a
bridge in ether_ifdetach.

diffstat:

 sys/net/if_ethersubr.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 1e68028a7d14 -r 859edb94bd2f sys/net/if_ethersubr.c
--- a/sys/net/if_ethersubr.c    Sun Jun 06 06:54:28 2004 +0000
+++ b/sys/net/if_ethersubr.c    Mon Jun 07 06:30:11 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ethersubr.c,v 1.114 2003/10/30 01:43:08 simonb Exp $        */
+/*     $NetBSD: if_ethersubr.c,v 1.114.2.1 2004/06/07 06:30:11 jdc Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.114 2003/10/30 01:43:08 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.114.2.1 2004/06/07 06:30:11 jdc Exp $");
 
 #include "opt_inet.h"
 #include "opt_atalk.h"
@@ -1110,6 +1110,11 @@
        struct ether_multi *enm;
        int s;
 
+#if NBRIDGE > 0
+       if (ifp->if_bridge)
+               bridge_ifdetach(ifp);
+#endif
+
 #if NBPFILTER > 0
        bpfdetach(ifp);
 #endif