From owner-svn-src-head@freebsd.org Fri Mar 15 17:13:06 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 603881527515; Fri, 15 Mar 2019 17:13:06 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F1EA071D69; Fri, 15 Mar 2019 17:13:05 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E4B91D3DC; Fri, 15 Mar 2019 17:13:05 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2FHD5Jp054039; Fri, 15 Mar 2019 17:13:05 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2FHD5sk054038; Fri, 15 Mar 2019 17:13:05 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201903151713.x2FHD5sk054038@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Fri, 15 Mar 2019 17:13:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345192 - head/sys/net X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/sys/net X-SVN-Commit-Revision: 345192 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F1EA071D69 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2019 17:13:06 -0000 Author: kevans Date: Fri Mar 15 17:13:05 2019 New Revision: 345192 URL: https://svnweb.freebsd.org/changeset/base/345192 Log: if_bridge(4): Drop pointless rtflush At this point, all routes should've already been dropped by removing all members from the bridge. This condition is in-fact KASSERT'd in the line immediately above where this nop flush was added. Modified: head/sys/net/if_bridge.c Modified: head/sys/net/if_bridge.c ============================================================================== --- head/sys/net/if_bridge.c Fri Mar 15 17:04:33 2019 (r345191) +++ head/sys/net/if_bridge.c Fri Mar 15 17:13:05 2019 (r345192) @@ -2449,6 +2449,22 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) } \ m->m_pkthdr.rcvif = iface; \ BRIDGE_UNLOCK(sc); \ + /* \ + * These mbufs will not have another chance to get sent \ + * to bpf elsewhere in the stack as being received \ + * by this interface, because they are coming in over \ + * the bridge. They likely have been accounted for \ + * when received by the interface that they came from, \ + * but this is not enough for other consumers, \ + * e.g. dhclient, to be satisfied. \ + * \ + * rcvif needs to be set on the mbuf here, lest we risk \ + * losing the mbuf as a "duplicate" because it's \ + * considered outgoing by bpf. \ + */ \ + if ((iface)->if_type != IFT_BRIDGE && \ + (iface)->if_bpf != NULL && (iface) != (ifp)) \ + ETHER_BPF_MTAP(iface, m); \ return (m); \ } \ \ @@ -2890,7 +2906,6 @@ bridge_rtable_fini(struct bridge_softc *sc) KASSERT(sc->sc_brtcnt == 0, ("%s: %d bridge routes referenced", __func__, sc->sc_brtcnt)); - bridge_rtflush(sc, 1); free(sc->sc_rthash, M_DEVBUF); }