diff options
| author | Florian Westphal | 2017-11-07 07:20:07 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2018-01-08 16:47:14 +0100 |
| commit | 39215846740a9f29ac7dac276f9df98135f39bb0 (patch) | |
| tree | fcbb760bcf36fca86ade7710db910b31796212d6 /net/netfilter/nf_conntrack_netlink.c | |
| parent | Merge branch 'ipv6-ipv4-nexthop-align' (diff) | |
| download | kernel-qcow2-linux-39215846740a9f29ac7dac276f9df98135f39bb0.tar.gz kernel-qcow2-linux-39215846740a9f29ac7dac276f9df98135f39bb0.tar.xz kernel-qcow2-linux-39215846740a9f29ac7dac276f9df98135f39bb0.zip | |
netfilter: conntrack: remove nlattr_size pointer from l4proto trackers
similar to previous commit, but instead compute this at compile time
and turn nlattr_size into an u16.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_netlink.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 382d49792f42..316bbdc4a158 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c @@ -544,7 +544,7 @@ static size_t ctnetlink_proto_size(const struct nf_conn *ct) len *= 3u; /* ORIG, REPLY, MASTER */ l4proto = __nf_ct_l4proto_find(nf_ct_l3num(ct), nf_ct_protonum(ct)); - len += l4proto->nla_size; + len += l4proto->nlattr_size; if (l4proto->nlattr_tuple_size) { len4 = l4proto->nlattr_tuple_size(); len4 *= 3u; /* ORIG, REPLY, MASTER */ |