netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 05/31] netfilter: ipset: make ip_set_put_flags extern.
Date: Sat, 26 Oct 2019 13:47:07 +0200	[thread overview]
Message-ID: <20191026114733.28111-6-pablo@netfilter.org> (raw)
In-Reply-To: <20191026114733.28111-1-pablo@netfilter.org>

From: Jeremy Sowden <jeremy@azazel.net>

ip_set_put_flags is rather large for a static inline function in a
header-file.  Move it to ip_set_core.c and export it.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Acked-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 include/linux/netfilter/ipset/ip_set.h | 23 +----------------------
 net/netfilter/ipset/ip_set_core.c      | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
index 44f6de8a1733..4d8b1eaf7708 100644
--- a/include/linux/netfilter/ipset/ip_set.h
+++ b/include/linux/netfilter/ipset/ip_set.h
@@ -276,28 +276,7 @@ ip_set_ext_destroy(struct ip_set *set, void *data)
 	}
 }
 
-static inline int
-ip_set_put_flags(struct sk_buff *skb, struct ip_set *set)
-{
-	u32 cadt_flags = 0;
-
-	if (SET_WITH_TIMEOUT(set))
-		if (unlikely(nla_put_net32(skb, IPSET_ATTR_TIMEOUT,
-					   htonl(set->timeout))))
-			return -EMSGSIZE;
-	if (SET_WITH_COUNTER(set))
-		cadt_flags |= IPSET_FLAG_WITH_COUNTERS;
-	if (SET_WITH_COMMENT(set))
-		cadt_flags |= IPSET_FLAG_WITH_COMMENT;
-	if (SET_WITH_SKBINFO(set))
-		cadt_flags |= IPSET_FLAG_WITH_SKBINFO;
-	if (SET_WITH_FORCEADD(set))
-		cadt_flags |= IPSET_FLAG_WITH_FORCEADD;
-
-	if (!cadt_flags)
-		return 0;
-	return nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(cadt_flags));
-}
+int ip_set_put_flags(struct sk_buff *skb, struct ip_set *set);
 
 /* Netlink CB args */
 enum {
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 30bc7df2f4cf..35cf59e4004b 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -1418,6 +1418,30 @@ static int ip_set_swap(struct net *net, struct sock *ctnl, struct sk_buff *skb,
 #define DUMP_TYPE(arg)		(((u32)(arg)) & 0x0000FFFF)
 #define DUMP_FLAGS(arg)		(((u32)(arg)) >> 16)
 
+int
+ip_set_put_flags(struct sk_buff *skb, struct ip_set *set)
+{
+	u32 cadt_flags = 0;
+
+	if (SET_WITH_TIMEOUT(set))
+		if (unlikely(nla_put_net32(skb, IPSET_ATTR_TIMEOUT,
+					   htonl(set->timeout))))
+			return -EMSGSIZE;
+	if (SET_WITH_COUNTER(set))
+		cadt_flags |= IPSET_FLAG_WITH_COUNTERS;
+	if (SET_WITH_COMMENT(set))
+		cadt_flags |= IPSET_FLAG_WITH_COMMENT;
+	if (SET_WITH_SKBINFO(set))
+		cadt_flags |= IPSET_FLAG_WITH_SKBINFO;
+	if (SET_WITH_FORCEADD(set))
+		cadt_flags |= IPSET_FLAG_WITH_FORCEADD;
+
+	if (!cadt_flags)
+		return 0;
+	return nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(cadt_flags));
+}
+EXPORT_SYMBOL_GPL(ip_set_put_flags);
+
 static int
 ip_set_dump_done(struct netlink_callback *cb)
 {
-- 
2.11.0


  parent reply	other threads:[~2019-10-26 11:47 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-26 11:47 [PATCH 00/31] Netfilter/IPVS updates for net-next Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 01/31] netfilter: ipset: add a coding-style fix to ip_set_ext_destroy Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 02/31] netfilter: ipset: remove inline from static functions in .c files Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 03/31] netfilter: ipset: move ip_set_comment functions from ip_set.h to ip_set_core.c Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 04/31] netfilter: ipset: move functions " Pablo Neira Ayuso
2019-10-26 11:47 ` Pablo Neira Ayuso [this message]
2019-10-26 11:47 ` [PATCH 06/31] netfilter: ipset: move function to ip_set_bitmap_ip.c Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 07/31] netfilter: ipset: move ip_set_get_ip_port() to ip_set_bitmap_port.c Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 08/31] ipvs: no need to update skb route entry for local destination packets Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 09/31] ipvs: batch __ip_vs_cleanup Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 10/31] ipvs: batch __ip_vs_dev_cleanup Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 11/31] selftests: netfilter: add ipvs test script Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 12/31] selftests: netfilter: add ipvs nat test case Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 13/31] selftests: netfilter: add ipvs tunnel " Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 14/31] netfilter: ecache: document extension area access rules Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 15/31] netfilter: ctnetlink: don't dump ct extensions of unconfirmed conntracks Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 16/31] netfilter: conntrack: free extension area immediately Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 17/31] netfilter: add and use nf_hook_slow_list() Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 18/31] netfilter: nft_tproxy: Fix typo in IPv6 module description Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 19/31] netfilter: nf_flow_table: move priority to struct nf_flowtable Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 20/31] netfilter: nf_tables: dynamically allocate hooks per net_device in flowtables Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 21/31] netfilter: nf_tables: allow netdevice to be used only once per flowtable Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 22/31] netfilter: nf_tables: increase maximum devices number " Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 23/31] netfilter: nf_tables_offload: add nft_flow_block_chain() Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 24/31] netfilter: nf_tables_offload: Pass callback list to nft_setup_cb_call() Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 25/31] netfilter: nf_tables_offload: add nft_flow_cls_offload_setup() Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 26/31] netfilter: nf_tables_offload: remove rules on unregistered device only Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 27/31] netfilter: nf_tables: support for multiple devices per netdev hook Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 28/31] netfilter: ecache: don't look for ecache extension on dying/unconfirmed conntracks Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 29/31] netfilter: nf_tables_offload: add nft_chain_offload_cmd() Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 30/31] netfilter: nf_tables_offload: add nft_flow_block_offload_init() Pablo Neira Ayuso
2019-10-26 11:47 ` [PATCH 31/31] netfilter: nf_tables_offload: unbind if multi-device binding fails Pablo Neira Ayuso
2019-10-26 18:36 ` [PATCH 00/31] Netfilter/IPVS 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=20191026114733.28111-6-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).