Message ID | 20100331182116.GB2822@psychotron.redhat.com |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
Le mercredi 31 mars 2010 à 20:21 +0200, Jiri Pirko a écrit : > Okay, I see your point. How about this: > > Subject: [net-next-2.6 PATCH] netfilter: ctnetlink: compute message size properly V2 > > Message size should be dependent on net->ct.sysctl_acct, not on > CONFIG_NF_CT_ACCT definition. > Then Changelog is not updated with the actual test :) > Signed-off-by: Jiri Pirko <jpirko@redhat.com> > > diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c > index 569410a..44487d8 100644 > --- a/net/netfilter/nf_conntrack_netlink.c > +++ b/net/netfilter/nf_conntrack_netlink.c > @@ -426,6 +426,17 @@ ctnetlink_proto_size(const struct nf_conn *ct) > } > > static inline size_t > +ctnetlink_counters_size(const struct nf_conn *ct) > +{ > + if (!nf_ct_ext_exist(ct, NF_CT_EXT_ACCT)) > + return 0; > + return 2 * nla_total_size(0) /* CTA_COUNTERS_ORIG|REPL */ > + + 2 * nla_total_size(sizeof(uint64_t)) /* CTA_COUNTERS_PACKETS */ > + + 2 * nla_total_size(sizeof(uint64_t)) /* CTA_COUNTERS_BYTES */ > + ; > +} > + > +static inline size_t > ctnetlink_nlmsg_size(const struct nf_conn *ct) > { > return NLMSG_ALIGN(sizeof(struct nfgenmsg)) > @@ -435,11 +446,7 @@ ctnetlink_nlmsg_size(const struct nf_conn *ct) > + 3 * nla_total_size(sizeof(u_int8_t)) /* CTA_PROTO_NUM */ > + nla_total_size(sizeof(u_int32_t)) /* CTA_ID */ > + nla_total_size(sizeof(u_int32_t)) /* CTA_STATUS */ > -#ifdef CONFIG_NF_CT_ACCT > - + 2 * nla_total_size(0) /* CTA_COUNTERS_ORIG|REPL */ > - + 2 * nla_total_size(sizeof(uint64_t)) /* CTA_COUNTERS_PACKETS */ > - + 2 * nla_total_size(sizeof(uint64_t)) /* CTA_COUNTERS_BYTES */ > -#endif > + + ctnetlink_counters_size(ct) > + nla_total_size(sizeof(u_int32_t)) /* CTA_TIMEOUT */ > + nla_total_size(0) /* CTA_PROTOINFO */ > + nla_total_size(0) /* CTA_HELP */ > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Eric Dumazet wrote: > Le mercredi 31 mars 2010 à 20:21 +0200, Jiri Pirko a écrit : >> Okay, I see your point. How about this: >> >> Subject: [net-next-2.6 PATCH] netfilter: ctnetlink: compute message size properly V2 >> >> Message size should be dependent on net->ct.sysctl_acct, not on >> CONFIG_NF_CT_ACCT definition. >> > > Then Changelog is not updated with the actual test :) I've fixed up the changelog and applied the patch, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Thu, Apr 01, 2010 at 12:40:23PM CEST, kaber@trash.net wrote: >Eric Dumazet wrote: >> Le mercredi 31 mars 2010 à 20:21 +0200, Jiri Pirko a écrit : >>> Okay, I see your point. How about this: >>> >>> Subject: [net-next-2.6 PATCH] netfilter: ctnetlink: compute message size properly V2 >>> >>> Message size should be dependent on net->ct.sysctl_acct, not on >>> CONFIG_NF_CT_ACCT definition. >>> >> >> Then Changelog is not updated with the actual test :) > >I've fixed up the changelog and applied the patch, thanks. Cand I ask on which tree? thanks Jirka -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Jiri Pirko wrote: > Thu, Apr 01, 2010 at 12:40:23PM CEST, kaber@trash.net wrote: >> Eric Dumazet wrote: >>> Le mercredi 31 mars 2010 à 20:21 +0200, Jiri Pirko a écrit : >>>> Okay, I see your point. How about this: >>>> >>>> Subject: [net-next-2.6 PATCH] netfilter: ctnetlink: compute message size properly V2 >>>> >>>> Message size should be dependent on net->ct.sysctl_acct, not on >>>> CONFIG_NF_CT_ACCT definition. >>>> >>> Then Changelog is not updated with the actual test :) >> I've fixed up the changelog and applied the patch, thanks. > > Cand I ask on which tree? Since this doesn't confirm to Dave's definition of crucial fixes, I've applied it to nf-next-2.6.git :) git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 569410a..44487d8 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -426,6 +426,17 @@ ctnetlink_proto_size(const struct nf_conn *ct) } static inline size_t +ctnetlink_counters_size(const struct nf_conn *ct) +{ + if (!nf_ct_ext_exist(ct, NF_CT_EXT_ACCT)) + return 0; + return 2 * nla_total_size(0) /* CTA_COUNTERS_ORIG|REPL */ + + 2 * nla_total_size(sizeof(uint64_t)) /* CTA_COUNTERS_PACKETS */ + + 2 * nla_total_size(sizeof(uint64_t)) /* CTA_COUNTERS_BYTES */ + ; +} + +static inline size_t ctnetlink_nlmsg_size(const struct nf_conn *ct) { return NLMSG_ALIGN(sizeof(struct nfgenmsg)) @@ -435,11 +446,7 @@ ctnetlink_nlmsg_size(const struct nf_conn *ct) + 3 * nla_total_size(sizeof(u_int8_t)) /* CTA_PROTO_NUM */ + nla_total_size(sizeof(u_int32_t)) /* CTA_ID */ + nla_total_size(sizeof(u_int32_t)) /* CTA_STATUS */ -#ifdef CONFIG_NF_CT_ACCT - + 2 * nla_total_size(0) /* CTA_COUNTERS_ORIG|REPL */ - + 2 * nla_total_size(sizeof(uint64_t)) /* CTA_COUNTERS_PACKETS */ - + 2 * nla_total_size(sizeof(uint64_t)) /* CTA_COUNTERS_BYTES */ -#endif + + ctnetlink_counters_size(ct) + nla_total_size(sizeof(u_int32_t)) /* CTA_TIMEOUT */ + nla_total_size(0) /* CTA_PROTOINFO */ + nla_total_size(0) /* CTA_HELP */