From owner-svn-src-head@freebsd.org Fri Mar 15 17:16:47 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 422B71527745; Fri, 15 Mar 2019 17:16:47 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D9E43720B1; Fri, 15 Mar 2019 17:16:46 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 734801DB60; Fri, 15 Mar 2019 17:16:46 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-lj1-f178.google.com with SMTP id y9so8339931ljk.6; Fri, 15 Mar 2019 10:16:46 -0700 (PDT) X-Gm-Message-State: APjAAAUuCvsEEZdzBsJ7zeNdwvkwno1OtNBz9d7IJ5JyS8TVjYX1tpGz yJxtpyUk74BaJJ2xUGXOkYFsjoQHpVc6pCDc5zU= X-Google-Smtp-Source: APXvYqxtuQUVM/2H+0b+xJYBzmQ9Jt9vHdpZXwj4+p7+BqJhFIoEONHf2iPwUl8LVP74vbYYUmPCmCZmsBriE6gia/c= X-Received: by 2002:a2e:9bd5:: with SMTP id w21mr2836492ljj.66.1552670204998; Fri, 15 Mar 2019 10:16:44 -0700 (PDT) MIME-Version: 1.0 References: <201903151713.x2FHD5sk054038@repo.freebsd.org> <20190315171421.GD7163@vega.codepro.be> In-Reply-To: <20190315171421.GD7163@vega.codepro.be> From: Kyle Evans Date: Fri, 15 Mar 2019 12:16:32 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r345192 - head/sys/net To: Kristof Provost Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: D9E43720B1 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.984,0] 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:16:47 -0000 On Fri, Mar 15, 2019 at 12:14 PM Kristof Provost wrote: > > 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. > *sigh* wrong tree. =(