Sat Dec 22 04:28:30 2018 UTC ()

Take the interface out of promiscuous mode in bridge_delete_member()
instead of bridge_ioctl_del(). Otherwise, the member interfaces are
left in promiscuous mode when the bridge is destroyed.


(rin)

diff -r1.163 -r1.164 src/sys/net/if_bridge.c

--- src/sys/net/if_bridge.c 2018/12/15 07:38:58	1.163
+++ src/sys/net/if_bridge.c 2018/12/22 04:28:30	1.164

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_bridge.c,v 1.163 2018/12/15 07:38:58 rin Exp $	*/
+/*	$NetBSD: if_bridge.c,v 1.164 2018/12/22 04:28:30 rin Exp $	*/
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -70,27 +70,27 @@
 /*
  * Network interface bridge support.
+ *
  * TODO:
+ *
  *	- Currently only supports Ethernet-like interfaces (Ethernet,
  *	  802.11, VLANs on Ethernet, etc.)  Figure out a nice way
  *	  to bridge other types of interfaces (FDDI-FDDI, and maybe
  *	  consider heterogenous bridges).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.163 2018/12/15 07:38:58 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.164 2018/12/22 04:28:30 rin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_bridge_ipf.h"
 #include "opt_inet.h"
 #include "opt_net_mpsafe.h"
 #endif /* _KERNEL_OPT */
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h> /* for softnet_lock */
 @@ -733,26 +733,45 @@ bridge_delete_member(struct bridge_softc
+{
 	struct ifnet *ifs = bif->bif_ifp;
 	KASSERT(BRIDGE_LOCKED(sc));
 	ifs->_if_input = ether_input;
 	ifs->if_bridge = NULL;
 	ifs->if_bridgeif = NULL;
 	PSLIST_WRITER_REMOVE(bif, bif_next);
 	BRIDGE_PSZ_PERFORM(sc);
 	BRIDGE_UNLOCK(sc);
 	switch (ifs->if_type) {
 	case IFT_ETHER:
 	case IFT_L2TP:
 		/*
 		 * Take the interface out of promiscuous mode.
 		 * Don't call it with holding a spin lock.
 		 */
 		(void) ifpromisc(ifs, 0);
 		IFNET_LOCK(ifs);
 		(void) ether_disable_vlan_mtu(ifs);
 		IFNET_UNLOCK(ifs);
 		break;
 	default:
 #ifdef DIAGNOSTIC
 		panic("%s: impossible", __func__);
 #endif
 		break;
+	}
 	psref_target_destroy(&bif->bif_psref, bridge_psref_class);
 	PSLIST_ENTRY_DESTROY(bif, bif_next);
 	kmem_free(bif, sizeof(*bif));
 	BRIDGE_LOCK(sc);
+}
 /*
  * bridge_calc_csum_flags:
+ *
  *	Calculate logical and b/w csum flags each member interface supports.
  */
 @@ -887,45 +906,26 @@ bridge_ioctl_del(struct bridge_softc *sc
 		if (strcmp(ifs->if_xname, name) == 0)
 			break;
+	}
 	if (bif == NULL) {
 		BRIDGE_UNLOCK(sc);
 		return ENOENT;
+	}
 	bridge_delete_member(sc, bif);
 	BRIDGE_UNLOCK(sc);
 	switch (ifs->if_type) {
 	case IFT_ETHER:
 	case IFT_L2TP:
 		/*
 		 * Take the interface out of promiscuous mode.
 		 * Don't call it with holding a spin lock.
 		 */
 		(void) ifpromisc(ifs, 0);
 		IFNET_LOCK(ifs);
 		(void) ether_disable_vlan_mtu(ifs);
 		IFNET_UNLOCK(ifs);
 		break;
 	default:
 #ifdef DIAGNOSTIC
 		panic("bridge_delete_member: impossible");
 #endif
 		break;
 	bridge_rtdelete(sc, ifs);
 	bridge_calc_csum_flags(sc);
 	if (sc->sc_if.if_flags & IFF_RUNNING)
 		bstp_initialization(sc);
 	return 0;
+}
 static int
 bridge_ioctl_gifflags(struct bridge_softc *sc, void *arg)
+{
 	struct ifbreq *req = arg;