netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Jozsef Kadlecsik <kadlec@netfilter.org>,
	Florian Westphal <fw@strlen.de>,
	"David S . Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>,
	NetFilter <netfilter-devel@vger.kernel.org>,
	coreteam@netfilter.org, netdev <netdev@vger.kernel.org>,
	Linux-Next <linux-next@vger.kernel.org>
Subject: Re: [PATCH] netfilter: nft_fwd_netdev: Fix CONFIG_NET_CLS_ACT=n build
Date: Wed, 25 Mar 2020 12:02:18 +0100	[thread overview]
Message-ID: <20200325110218.ga2m5n2jfbdbfivs@salvia> (raw)
In-Reply-To: <CAMuHMdWRKW3HoWk+drmbwKi6wArN9qjgjp=8NcyBK7P2kT=cLg@mail.gmail.com>

On Wed, Mar 25, 2020 at 12:00:08PM +0100, Geert Uytterhoeven wrote:
> Hi Pablo,
> 
> On Wed, Mar 25, 2020 at 11:40 AM Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> > On Wed, Mar 25, 2020 at 10:33:00AM +0100, Geert Uytterhoeven wrote:
> > > If CONFIG_NET_CLS_ACT=n:
> > >
> > >     net/netfilter/nft_fwd_netdev.c: In function ‘nft_fwd_netdev_eval’:
> > >     net/netfilter/nft_fwd_netdev.c:32:10: error: ‘struct sk_buff’ has no member named ‘tc_redirected’
> > >       pkt->skb->tc_redirected = 1;
> > >             ^~
> > >     net/netfilter/nft_fwd_netdev.c:33:10: error: ‘struct sk_buff’ has no member named ‘tc_from_ingress’
> > >       pkt->skb->tc_from_ingress = 1;
> > >             ^~
> > >
> > > Fix this by protecting this code hunk with the appropriate #ifdef.
> >
> > Sorry about this, and thank you for fixing up this so fast.
> >
> > I'm attaching an alternative fix to avoid a dependency on tc from
> > netfilter. Still testing, if fine and no objections I'll formally
> > submit this.
> 
> Thanks, that fixes the issue, too.
> (Note that I didn't do a full build).

Thanks. I'll submit formaly asap.

There was another spot I forgot to update in net/core/pktgen.c, I will
include that chunk too in my formal submission.

      reply	other threads:[~2020-03-25 11:02 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-25  9:33 [PATCH] netfilter: nft_fwd_netdev: Fix CONFIG_NET_CLS_ACT=n build Geert Uytterhoeven
2020-03-25 10:40 ` Pablo Neira Ayuso
2020-03-25 11:00   ` Geert Uytterhoeven
2020-03-25 11:02     ` Pablo Neira Ayuso [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200325110218.ga2m5n2jfbdbfivs@salvia \
    --to=pablo@netfilter.org \
    --cc=coreteam@netfilter.org \
    --cc=davem@davemloft.net \
    --cc=fw@strlen.de \
    --cc=geert@linux-m68k.org \
    --cc=kadlec@netfilter.org \
    --cc=kuba@kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).