public inbox for netdev@vger.kernel.org 
 help / color / mirror / Atom feed

From: Pablo Neira Ayuso <pablo@netfilter•org>
To: Simon Horman <horms@kernel•org>
Cc: Andy Shevchenko <andriy.shevchenko@linux•intel.com>,
	Pavel Tikhomirov <ptikhomirov@virtuozzo•com>,
	netfilter-devel@vger•kernel.org, coreteam@netfilter•org,
	netdev@vger•kernel.org, linux-kernel@vger•kernel.org,
	llvm@lists•linux.dev, Jozsef Kadlecsik <kadlec@netfilter•org>,
	"David S. Miller" <davem@davemloft•net>,
	David Ahern <dsahern@kernel•org>,
	Eric Dumazet <edumazet@google•com>,
	Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>,
	Nathan Chancellor <nathan@kernel•org>,
	Nick Desaulniers <ndesaulniers@google•com>,
	Bill Wendling <morbo@google•com>,
	Justin Stitt <justinstitt@google•com>
Subject: Re: [PATCH net v1 1/1] netfilter: nf_reject: Fix build error when CONFIG_BRIDGE_NETFILTER=n
Date: Sun, 15 Sep 2024 23:22:02 +0200	[thread overview]
Message-ID: <ZudP-mkhquCJJPXv@calendula> (raw)
In-Reply-To: <20240907134837.GP2097826@kernel.org>

Hi Simon,

This proposed update to address this compile time warning LGTM.

Would you submit it?

Thanks.

On Sat, Sep 07, 2024 at 02:48:37PM +0100, Simon Horman wrote:
[...]
> diff --git a/net/ipv4/netfilter/nf_reject_ipv4.c b/net/ipv4/netfilter/nf_reject_ipv4.c
> index 04504b2b51df..87fd945a0d27 100644
> --- a/net/ipv4/netfilter/nf_reject_ipv4.c
> +++ b/net/ipv4/netfilter/nf_reject_ipv4.c
> @@ -239,9 +239,8 @@ static int nf_reject_fill_skb_dst(struct sk_buff *skb_in)
>  void nf_send_reset(struct net *net, struct sock *sk, struct sk_buff *oldskb,
>  		   int hook)
>  {
> -	struct sk_buff *nskb;
> -	struct iphdr *niph;
>  	const struct tcphdr *oth;
> +	struct sk_buff *nskb;
>  	struct tcphdr _oth;
>  
>  	oth = nf_reject_ip_tcphdr_get(oldskb, &_oth, hook);
> @@ -266,14 +265,12 @@ void nf_send_reset(struct net *net, struct sock *sk, struct sk_buff *oldskb,
>  	nskb->mark = IP4_REPLY_MARK(net, oldskb->mark);
>  
>  	skb_reserve(nskb, LL_MAX_HEADER);
> -	niph = nf_reject_iphdr_put(nskb, oldskb, IPPROTO_TCP,
> -				   ip4_dst_hoplimit(skb_dst(nskb)));
> +	nf_reject_iphdr_put(nskb, oldskb, IPPROTO_TCP,
> +			    ip4_dst_hoplimit(skb_dst(nskb)));
>  	nf_reject_ip_tcphdr_put(nskb, oldskb, oth);
>  	if (ip_route_me_harder(net, sk, nskb, RTN_UNSPEC))
>  		goto free_nskb;
>  
> -	niph = ip_hdr(nskb);
> -
>  	/* "Never happens" */
>  	if (nskb->len > dst_mtu(skb_dst(nskb)))
>  		goto free_nskb;
> @@ -290,6 +287,7 @@ void nf_send_reset(struct net *net, struct sock *sk, struct sk_buff *oldskb,
>  	 */
>  	if (nf_bridge_info_exists(oldskb)) {
>  		struct ethhdr *oeth = eth_hdr(oldskb);
> +		struct iphdr *niph = ip_hdr(nskb);
>  		struct net_device *br_indev;
>  
>  		br_indev = nf_bridge_get_physindev(oldskb, net);

next prev parent reply	other threads:[~2024-09-15 21:22 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-06 14:55 [PATCH net v1 1/1] netfilter: nf_reject: Fix build error when CONFIG_BRIDGE_NETFILTER=n Andy Shevchenko
2024-09-07 13:48 ` Simon Horman
2024-09-09  9:44   ` Andy Shevchenko
2024-09-15 21:22   ` Pablo Neira Ayuso [this message]
2024-09-16  7:32     ` Simon Horman
2024-09-16  9:52       ` Simon Horman

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=ZudP-mkhquCJJPXv@calendula \
    --to=pablo@netfilter$(echo .)org \
    --cc=andriy.shevchenko@linux$(echo .)intel.com \
    --cc=coreteam@netfilter$(echo .)org \
    --cc=davem@davemloft$(echo .)net \
    --cc=dsahern@kernel$(echo .)org \
    --cc=edumazet@google$(echo .)com \
    --cc=horms@kernel$(echo .)org \
    --cc=justinstitt@google$(echo .)com \
    --cc=kadlec@netfilter$(echo .)org \
    --cc=kuba@kernel$(echo .)org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=llvm@lists$(echo .)linux.dev \
    --cc=morbo@google$(echo .)com \
    --cc=nathan@kernel$(echo .)org \
    --cc=ndesaulniers@google$(echo .)com \
    --cc=netdev@vger$(echo .)kernel.org \
    --cc=netfilter-devel@vger$(echo .)kernel.org \
    --cc=pabeni@redhat$(echo .)com \
    --cc=ptikhomirov@virtuozzo$(echo .)com \
    /path/to/YOUR_REPLY

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox