public inbox for bridge@lists.linux.dev
 help / color / mirror / Atom feed
From: Florian Westphal <fw@strlen.de>
To: <netfilter-devel@vger.kernel.org>
Cc: jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us,
	audit@vger.kernel.org, bridge@lists.linux.dev,
	Florian Westphal <fw@strlen.de>
Subject: [PATCH nf-next 0/2] net: netfilter: avoid implicit includes
Date: Wed,  7 Jan 2026 16:24:07 +0100	[thread overview]
Message-ID: <20260107152548.31769-1-fw@strlen.de> (raw)

There are various headers/subsystems that include xtables or
nftables headers even though they are unrelated.

Also nf_conntrack relies on implicit includes, esp. for GRE
internals, which get pulled in via nf_conntrack.h even though only
nf_conntrack_proto_gre.c needs this.

Other locations should include pptp.h or gre.h as needed.
Start to remove some of these entanglements.

Florian Westphal (2):
  netfilter: nf_conntrack: don't rely on implicit includes
  netfilter: don't include xt and nftables.h in unrelated subsystems

 include/linux/audit.h                            | 1 -
 include/linux/netfilter/nf_conntrack_proto_gre.h | 3 ---
 include/net/netfilter/nf_conntrack.h             | 1 +
 include/net/netfilter/nf_conntrack_tuple.h       | 2 +-
 include/net/netfilter/nf_tables.h                | 1 -
 net/bridge/netfilter/nf_conntrack_bridge.c       | 3 +--
 net/netfilter/nf_conntrack_h323_main.c           | 1 +
 net/netfilter/nf_conntrack_netlink.c             | 1 +
 net/netfilter/nf_conntrack_proto_gre.c           | 2 ++
 net/netfilter/nf_flow_table_ip.c                 | 2 ++
 net/netfilter/nf_flow_table_offload.c            | 1 +
 net/netfilter/nf_flow_table_path.c               | 1 +
 net/netfilter/nf_nat_ovs.c                       | 3 +++
 net/netfilter/nf_nat_proto.c                     | 1 +
 net/netfilter/nf_synproxy_core.c                 | 1 +
 net/netfilter/nf_tables_api.c                    | 1 +
 net/netfilter/nft_flow_offload.c                 | 1 +
 net/netfilter/nft_synproxy.c                     | 1 +
 net/sched/act_ct.c                               | 2 ++
 net/sched/act_ctinfo.c                           | 1 +
 20 files changed, 22 insertions(+), 8 deletions(-)

-- 
2.52.0


             reply	other threads:[~2026-01-07 15:26 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-07 15:24 Florian Westphal [this message]
2026-01-07 15:24 ` [PATCH nf-next 1/2] netfilter: nf_conntrack: don't rely on implicit includes Florian Westphal
2026-01-08 18:27   ` kernel test robot
2026-01-07 15:24 ` [PATCH nf-next 2/2] netfilter: don't include xt and nftables.h in unrelated subsystems Florian Westphal

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=20260107152548.31769-1-fw@strlen.de \
    --to=fw@strlen.de \
    --cc=audit@vger.kernel.org \
    --cc=bridge@lists.linux.dev \
    --cc=jhs@mojatatu.com \
    --cc=jiri@resnulli.us \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=xiyou.wangcong@gmail.com \
    /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