netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org,
	geert@linux-m68k.org
Subject: Re: [PATCH net] net: Fix CONFIG_NET_CLS_ACT=n and CONFIG_NFT_FWD_NETDEV={y,m} build
Date: Wed, 25 Mar 2020 12:29:30 -0700 (PDT)	[thread overview]
Message-ID: <20200325.122930.448274240867191914.davem@davemloft.net> (raw)
In-Reply-To: <20200325124718.77151-1-pablo@netfilter.org>

From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 25 Mar 2020 13:47:18 +0100

> 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;
>               ^~
> 
> To avoid a direct dependency with tc actions from netfilter, wrap the
> redirect bits around CONFIG_NET_REDIRECT and move helpers to
> include/linux/skbuff.h. Turn on this toggle from the ifb driver, the
> only existing client of these bits in the tree.
> 
> This patch adds skb_set_redirected() that sets on the redirected bit
> on the skbuff, it specifies if the packet was redirect from ingress
> and resets the timestamp (timestamp reset was originally missing in the
> netfilter bugfix).
> 
> Fixes: bcfabee1afd99484 ("netfilter: nft_fwd_netdev: allow to redirect to ifb via ingress")
> Reported-by: noreply@ellerman.id.au
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

Applied, thanks.

      reply	other threads:[~2020-03-25 19:29 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-25 12:47 [PATCH net] net: Fix CONFIG_NET_CLS_ACT=n and CONFIG_NFT_FWD_NETDEV={y,m} build Pablo Neira Ayuso
2020-03-25 19:29 ` David Miller [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=20200325.122930.448274240867191914.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=geert@linux-m68k.org \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.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).