Source-Changes-HG archive

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

[src/trunk]: src/sys/net bridge: revert prior



details:   https://anonhg.NetBSD.org/src/rev/62a788b7da97
branches:  trunk
changeset: 956603:62a788b7da97
user:      roy <roy%NetBSD.org@localhost>
date:      Mon Nov 02 12:14:59 2020 +0000

description:
bridge: revert prior

It's of little use.
If we need to do this in the future, consider a sysctl to do it for all
interfaces in the bridge and not just the one being added.

diffstat:

 sys/net/if_bridge.c |  18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)

diffs (46 lines):

diff -r 410b9aed6368 -r 62a788b7da97 sys/net/if_bridge.c
--- a/sys/net/if_bridge.c       Mon Nov 02 09:21:50 2020 +0000
+++ b/sys/net/if_bridge.c       Mon Nov 02 12:14:59 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bridge.c,v 1.176 2020/09/27 19:16:28 roy Exp $      */
+/*     $NetBSD: if_bridge.c,v 1.177 2020/11/02 12:14:59 roy Exp $      */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.176 2020/09/27 19:16:28 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.177 2020/11/02 12:14:59 roy Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -904,13 +904,6 @@
        PSLIST_ENTRY_INIT(bif, bif_next);
        psref_target_init(&bif->bif_psref, bridge_psref_class);
 
-       /*
-        * Pretend that the link is down for domains.
-        * This will detach any addresses assigned to the interface.
-        */
-       if (ifs->if_link_state != LINK_STATE_DOWN)
-               if_domain_link_state_change(ifs, LINK_STATE_DOWN);
-
        BRIDGE_LOCK(sc);
 
        ifs->if_bridge = sc;
@@ -928,13 +921,6 @@
        else
                bstp_stop(sc);
 
-       /*
-        * If the link was not initially down then mark any detached addresses
-        * as tentative and start Duplicate Address Detection for them.
-        */
-       if (ifs->if_link_state != LINK_STATE_DOWN)
-               if_domain_link_state_change(ifs, ifs->if_link_state);
-
 out:
        if_put(ifs, &psref);
        if (error) {



Home | Main Index | Thread Index | Old Index