Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp3637065ybi; Mon, 10 Jun 2019 13:53:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqxynl2lWW7Uvv6m/6EBPgaV+trZvCLDI7DPT/ZzLVqzU5YZYAlJZE5UcvrTX/X1tITFXLdo X-Received: by 2002:a62:778d:: with SMTP id s135mr4578902pfc.204.1560200014145; Mon, 10 Jun 2019 13:53:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560200014; cv=none; d=google.com; s=arc-20160816; b=WpHKWd0aLJviY2/anuFt8hFr8rjAyNxzY22s/EOsFpzNoMhQ+JdUp0a0aBCsqcp98P 8iZsx36KkpNBnuG1yjhQcLmXUuFRKnbxdjCd30mdhO+pWWNeMjAcFkUsNO+/FHeGWCUc HVIX0F62L5ufR/IMxfXecLIbZ4ho8BcKnsbpO1I+0jfYmHTIl0qh84HZKWSkZ8ObXcx1 azKJ7cIG23OT25Ch3LYgbJfybNq+B4WaFID7x8ujh6VUwb75OWY54YnIQe5GJiXbpgSH qT+3A4MKqXLXOuRdTievVL76P0X5q6BQH7H1PBFt2r7M8ROb2bftldySxYEKzp0tVIYn SXJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=LwPRrFIFVpFh7windfuH8fQym2aENAjRfJxjWELiSBU=; b=Tv70rhqlhGnXaA/dWAjUmhASwWGcZyxExgfrMovQ5/m/Ng/78/UeJz63/QWI621Ngz 48ZWm+YeFDB4Sm7mcyP+6f7m3mD2Qa4wPHfar9y4YX9ZA3MnOgCPC5KRX5FHy/gAxlip tCsOHrrkPfgOuKrLwQP2ch0D8ms0TM1ZSGnZBaTE/WmBBLi7dk6VQxogoTFWJVZGB1tk wFZvzuoz4krjn9aOH7arzJInwkBudg9oO67aecAi4b5/hnOyTXrmlllxsiB9hUK2cE+v /c5HRexCgEdjMCGjcuZQFRFzFzX7MSXFSB/ZGxOkQ5KN71M85GQQBp03q3EtQC7PU6W0 6aQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@brauner.io header.s=google header.b=Zb5w8rP8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a2si10738890pgj.54.2019.06.10.13.53.18; Mon, 10 Jun 2019 13:53:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@brauner.io header.s=google header.b=Zb5w8rP8; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389429AbfFJUvl (ORCPT + 99 others); Mon, 10 Jun 2019 16:51:41 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:36714 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727588AbfFJUvk (ORCPT ); Mon, 10 Jun 2019 16:51:40 -0400 Received: by mail-ed1-f67.google.com with SMTP id k21so13078726edq.3 for ; Mon, 10 Jun 2019 13:51:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brauner.io; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=LwPRrFIFVpFh7windfuH8fQym2aENAjRfJxjWELiSBU=; b=Zb5w8rP85WrEmAp+Zr/D+9qTV1RoeJ9+bGxf6ZGFaz//eje5o8iDyuC629FdHNoZHM M6NOkiKW5X94YWAH/0ShGapQoZma0hlhSk6PpQEgi915CF1Dv1mhkO/conE2CVt3RObX ksdmzpJiEaaT8Yjo9vuQP3/LNVzAO7x6LBf7L7PR+g89d/pcyU9i67wPGHBkQEiC2ISG qdF9toeA0vtNzb1Fd88YeDnqmdHXoZrEQoob4+rUi/sJyLbrlfMfj4RPQBeM7Zhz4UQr Rps++y3zxLadol/OIc8Cv+L+LUVb9gstJIM2XJOSfG/oNJXv+6ypGOgTjXRr43Utd7px oGWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=LwPRrFIFVpFh7windfuH8fQym2aENAjRfJxjWELiSBU=; b=EDNOWKAP8LdVgISLq5KVPq+01dtoq1QAjexX9tGQNdVzPDIYrFb+yjKoxs1PowbyGG T+1ZeWqwE8p6O0bB9IlnIdw/F6vqIWOt49Y7rvDnS1TPA+pms6+CCMcGE+RrcPPzx9Jf Hkqdk2xgIQI1H7hjEvPCP4HQv2DMEbQzjDQZ/m/D0anrlVAoisZv4Vxwldd78bz+N5mu RqrnUu0PgwP3ETozCcPQDcrRC5Qk4Xl1XjU80Ky2nCMaazphxAoyu1ntoQ3Q0Cn8INs8 CwAwWvtB82Vdz+PosOXYsoD6m1ItljM0r6fmqWpmLcHoG0DS+AJLnFdKQFaOQRkjgP/Q Uk9w== X-Gm-Message-State: APjAAAXkT9zKzVJ+3K7Hrqzlx3Xx1jDZ/b3OYabzu/XbIDUiTBITe57w UFeJGEz7SL+WgrhVKIa5l36haQ== X-Received: by 2002:a17:906:d7aa:: with SMTP id pk10mr1184294ejb.125.1560199899038; Mon, 10 Jun 2019 13:51:39 -0700 (PDT) Received: from brauner.io ([2a02:8109:9cc0:6dac:cd8f:f6e9:1b84:bbb1]) by smtp.gmail.com with ESMTPSA id k9sm1976063eja.72.2019.06.10.13.51.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 10 Jun 2019 13:51:38 -0700 (PDT) Date: Mon, 10 Jun 2019 22:51:36 +0200 From: Christian Brauner To: Pablo Neira Ayuso Cc: davem@davemloft.net, netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, bridge@lists.linux-foundation.org, tyhicks@canonical.com, kadlec@blackhole.kfki.hu, fw@strlen.de, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com, linux-kernel@vger.kernel.org, richardrose@google.com, vapier@chromium.org, bhthompson@google.com, smbarber@chromium.org, joelhockey@chromium.org, ueberall@themenzentrisch.de Subject: Re: [PATCH net-next v1 1/1] br_netfilter: namespace bridge netfilter sysctls Message-ID: <20190610205134.6wqparmtsdzbiutv@brauner.io> References: <20190609162304.3388-1-christian@brauner.io> <20190609162304.3388-2-christian@brauner.io> <20190610174136.p3fbcbn33en5bb7f@salvia> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20190610174136.p3fbcbn33en5bb7f@salvia> User-Agent: NeoMutt/20180716 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 10, 2019 at 07:41:36PM +0200, Pablo Neira Ayuso wrote: > Thanks for updating this patch to use struct brnf_net. > > A few comments below. > > On Sun, Jun 09, 2019 at 06:23:04PM +0200, Christian Brauner wrote: > [...] > > diff --git a/include/net/netfilter/br_netfilter.h b/include/net/netfilter/br_netfilter.h > > index 89808ce293c4..302fcd3aade2 100644 > > --- a/include/net/netfilter/br_netfilter.h > > +++ b/include/net/netfilter/br_netfilter.h > > @@ -85,17 +82,42 @@ static inline __be16 vlan_proto(const struct sk_buff *skb) > > return 0; > > } > > > > -#define IS_VLAN_IP(skb) \ > > - (vlan_proto(skb) == htons(ETH_P_IP) && \ > > - brnf_filter_vlan_tagged) > > +static inline bool is_vlan_ip(const struct sk_buff *skb, const struct net *net) > > +{ > > I like this conversion from macro to static inline a lot. > > But if you let me ask for one more change, would you split this in two > patches? One to replace #defines by static inline. Sure.