netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Ken-ichirou MATSUZAWA <chamaken@gmail.com>
Cc: The netfilter developer mailinglist <netfilter-devel@vger.kernel.org>
Subject: Re: [PATCH] netfilter: ctnetlink: add zone size to length
Date: Mon, 16 Jun 2014 13:56:29 +0200	[thread overview]
Message-ID: <20140616115629.GA10734@localhost> (raw)
In-Reply-To: <CAGCkEt29_QnR1N9+oPQt7mX=6_0GF0oTsT4WgTz_ajGyef+Odg@mail.gmail.com>

On Thu, Jun 12, 2014 at 08:34:55AM +0900, Ken-ichirou MATSUZAWA wrote:
> Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>

Applied, thanks.

>  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 5857963..e279b76 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

      reply	other threads:[~2014-06-16 11:56 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-11 23:34 [PATCH] netfilter: ctnetlink: add zone size to length Ken-ichirou MATSUZAWA
2014-06-16 11:56 ` Pablo Neira Ayuso [this message]

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=20140616115629.GA10734@localhost \
    --to=pablo@netfilter.org \
    --cc=chamaken@gmail.com \
    --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).