On Thu, Jun 12, 2014 at 08:34:55AM +0900, Ken-ichirou MATSUZAWA wrote: > Signed-off-by: Ken-ichirou MATSUZAWA <chamas@xxxxxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
