netdev.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 11/13] netfilter: ctnetlink: add zone size to length
Date: Wed, 18 Jun 2014 11:44:37 +0200	[thread overview]
Message-ID: <1403084679-11227-12-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1403084679-11227-1-git-send-email-pablo@netfilter.org>

From: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>

Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/netfilter/nf_conntrack_netlink.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 70123f4..300ed1e 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -597,6 +597,9 @@ ctnetlink_nlmsg_size(const struct nf_conn *ct)
 #ifdef CONFIG_NF_CONNTRACK_MARK
 	       + nla_total_size(sizeof(u_int32_t)) /* CTA_MARK */
 #endif
+#ifdef CONFIG_NF_CONNTRACK_ZONES
+	       + nla_total_size(sizeof(u_int16_t)) /* CTA_ZONE */
+#endif
 	       + ctnetlink_proto_size(ct)
 	       + ctnetlink_label_size(ct)
 	       ;
@@ -2040,6 +2043,9 @@ ctnetlink_nfqueue_build_size(const struct nf_conn *ct)
 #ifdef CONFIG_NF_CONNTRACK_MARK
 	       + nla_total_size(sizeof(u_int32_t)) /* CTA_MARK */
 #endif
+#ifdef CONFIG_NF_CONNTRACK_ZONES
+	       + nla_total_size(sizeof(u_int16_t)) /* CTA_ZONE */
+#endif
 	       + ctnetlink_proto_size(ct)
 	       ;
 }
-- 
1.7.10.4

  parent reply	other threads:[~2014-06-18  9:45 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-18  9:44 [PATCH 00/13] netfilter fixes for net Pablo Neira Ayuso
2014-06-18  9:44 ` [PATCH 01/13] ipvs: stop tot_stats estimator only under CONFIG_SYSCTL Pablo Neira Ayuso
2014-06-18  9:44 ` [PATCH 02/13] netfilter: ctnetlink: fix dumping of dying/unconfirmed conntracks Pablo Neira Ayuso
2014-06-18  9:44 ` [PATCH 03/13] netfilter: ctnetlink: fix refcnt leak in dying/unconfirmed list dumper Pablo Neira Ayuso
2014-06-18  9:44 ` [PATCH 04/13] netfilter: nf_tables: use RCU-safe list insertion when replacing rules Pablo Neira Ayuso
2014-06-18  9:44 ` [PATCH 05/13] netfilter: nf_tables: use u32 for chain use counter Pablo Neira Ayuso
2014-06-18  9:44 ` [PATCH 06/13] netfilter: nf_tables: decrement chain use counter when replacing rules Pablo Neira Ayuso
2014-06-18  9:44 ` [PATCH 07/13] netfilter: nf_tables: fix wrong type in transaction " Pablo Neira Ayuso
2014-06-18  9:44 ` [PATCH 08/13] netfilter: nft_compat: call {target, match}->destroy() to cleanup entry Pablo Neira Ayuso
2014-06-18  9:44 ` [PATCH 09/13] netfilter: nf_tables: indicate family when dumping set elements Pablo Neira Ayuso
2014-06-18  9:44 ` [PATCH 10/13] netfilter: nft_nat: don't dump port information if unset Pablo Neira Ayuso
2014-06-18  9:44 ` Pablo Neira Ayuso [this message]
2014-06-18  9:44 ` [PATCH 12/13] netfilter: nf_nat: fix oops on netns removal Pablo Neira Ayuso
2014-06-18  9:44 ` [PATCH 13/13] MAINTAINERS: merge ebtables into netfilter entry Pablo Neira Ayuso
2014-06-18 23:10 ` [PATCH 00/13] netfilter fixes for net 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=1403084679-11227-12-git-send-email-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).