From owner-svn-src-all@freebsd.org Fri Mar 15 17:14:25 2019 Return-Path: Delivered-To: svn-src-all@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 097B515275B3; Fri, 15 Mar 2019 17:14:25 +0000 (UTC) (envelope-from SRS0=j4N9=RS=vega.codepro.be=kp@codepro.be) Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.codepro.be", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9B97D71ED5; Fri, 15 Mar 2019 17:14:24 +0000 (UTC) (envelope-from SRS0=j4N9=RS=vega.codepro.be=kp@codepro.be) Received: from vega.codepro.be (unknown [172.16.1.3]) by venus.codepro.be (Postfix) with ESMTP id 28FA633679; Fri, 15 Mar 2019 18:14:22 +0100 (CET) Received: by vega.codepro.be (Postfix, from userid 1001) id 25D242248C; Fri, 15 Mar 2019 18:14:22 +0100 (CET) Date: Fri, 15 Mar 2019 18:14:22 +0100 From: Kristof Provost To: Kyle Evans Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r345192 - head/sys/net Message-ID: <20190315171421.GD7163@vega.codepro.be> References: <201903151713.x2FHD5sk054038@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <201903151713.x2FHD5sk054038@repo.freebsd.org> X-Checked-By-NSA: Probably User-Agent: Mutt/1.11.2 (2019-01-07) X-Rspamd-Queue-Id: 9B97D71ED5 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.98)[-0.978,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2019 17:14:25 -0000 On 2019-03-15 17:13:05 (+0000), Kyle Evans wrote: > 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); \ I think you didn't intend to commit this yet. Regards, Kristof