netfilter: conntrack: reduce size of l4protocol trackers

can use u16 for both, shrinks size by another 8 bytes.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index 47c16bae5e00335f76efc0243f33e0731f34d2f8..15c58dd3f701628c178c3ba7853bc32e1a59f96e 100644 (file)
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -92,12 +92,12 @@ struct nf_conntrack_l4proto {
 
 #if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
        struct {
-               size_t obj_size;
                int (*nlattr_to_obj)(struct nlattr *tb[],
                                     struct net *net, void *data);
                int (*obj_to_nlattr)(struct sk_buff *skb, const void *data);
 
-               unsigned int nlattr_max;
+               u16 obj_size;
+               u16 nlattr_max;
                const struct nla_policy *nla_policy;
        } ctnl_timeout;
 #endif