Module Name: src Committed By: roy Date: Mon Nov 2 12:14:59 UTC 2020
Modified Files: src/sys/net: if_bridge.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.176 -r1.177 src/sys/net/if_bridge.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_bridge.c diff -u src/sys/net/if_bridge.c:1.176 src/sys/net/if_bridge.c:1.177 --- src/sys/net/if_bridge.c:1.176 Sun Sep 27 19:16:28 2020 +++ src/sys/net/if_bridge.c Mon Nov 2 12:14:59 2020 @@ -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 @@ bridge_ioctl_add(struct bridge_softc *sc 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 @@ bridge_ioctl_add(struct bridge_softc *sc 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) {