From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 4/8] netfilter: remove ifdef around cttimeout in struct nf_conntrack_l4proto
Date: Fri, 10 Aug 2018 13:16:18 +0200 [thread overview]
Message-ID: <20180810111622.3981-5-pablo@netfilter.org> (raw)
In-Reply-To: <20180810111622.3981-1-pablo@netfilter.org>
Simplify this, include it inconditionally in this structure layout as we
do with ctnetlink.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
include/net/netfilter/nf_conntrack_l4proto.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index 6068c6da3eac..8465263b297d 100644
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -77,7 +77,6 @@ struct nf_conntrack_l4proto {
struct nf_conntrack_tuple *t);
const struct nla_policy *nla_policy;
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
struct {
int (*nlattr_to_obj)(struct nlattr *tb[],
struct net *net, void *data);
@@ -87,7 +86,6 @@ struct nf_conntrack_l4proto {
u16 nlattr_max;
const struct nla_policy *nla_policy;
} ctnl_timeout;
-#endif
#ifdef CONFIG_NF_CONNTRACK_PROCFS
/* Print out the private part of the conntrack. */
void (*print_conntrack)(struct seq_file *s, struct nf_conn *);
--
2.11.0
next prev parent reply other threads:[~2018-08-10 11:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-10 11:16 [PATCH 0/8] Netfilter updates for net-next Pablo Neira Ayuso
2018-08-10 11:16 ` [PATCH 1/8] netfilter: nft_osf: use NFT_OSF_MAXGENRELEN instead of IFNAMSIZ Pablo Neira Ayuso
2018-08-10 11:16 ` [PATCH 2/8] netfilter: cttimeout: move ctnl_untimeout to nf_conntrack Pablo Neira Ayuso
2018-08-10 11:16 ` [PATCH 3/8] netfilter: cttimeout: decouple timeout policy from nfnetlink_cttimeout object Pablo Neira Ayuso
2018-08-10 11:16 ` Pablo Neira Ayuso [this message]
2018-08-10 11:16 ` [PATCH 5/8] netfilter: nft_ct: add ct timeout support Pablo Neira Ayuso
2018-08-10 11:16 ` [PATCH 6/8] netfilter: nft_ct: enable conntrack for helpers Pablo Neira Ayuso
2018-08-10 11:16 ` [PATCH 7/8] netfilter: nfnetlink_osf: add missing enum in nfnetlink_osf uapi header Pablo Neira Ayuso
2018-08-10 11:16 ` [PATCH 8/8] netfilter: nfnetlink_osf: fix using plain integer as NULL warning Pablo Neira Ayuso
2018-08-10 17:43 ` [PATCH 0/8] Netfilter updates for net-next David Miller
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=20180810111622.3981-5-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--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).