On Mon, Mar 09, 2015 at 02:13:56PM +0100, Florian Westphal wrote: > Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> wrote: > > > I'm preparing a new net-next batch, I can quickly take these three if > > you agree: > > > > 1/8 bridge: move mac header copying into br_netfilter > > 2/8 netfilter: bridge: move nf_bridge_update_protocol to where its used > > 4/8 netfilter: bridge: refactor conditional in br_nf_dev_queue_xmit > > Sure. I can then submit the entire series (i.e. part1 without these 3 > plus part2). I have no further br netfilter changes after that. > > > Regarding 3/8, I think we can move that code to br_netfilter.c so we > > reduce ifdef pollution a bit and keep as much of this monster code > > fenced under that file. Please, see patch attached. > > Sure. OK, I'll push these four small changes in the follow nf-next pull request then, so you and Andry can sort out this. Thanks Florian. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
