diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2016-04-22 17:31:18 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-23 20:13:24 -0400 |
| commit | b46f6ded906ef0be52a4881ba50a084aeca64d7e (patch) | |
| tree | b17273779de462616ce20c370da5c7659f0cb975 /net/netfilter/nft_counter.c | |
| parent | e7479122befd7026cf0fb3b3740f17ebd9c64d35 (diff) | |
| download | linux-b46f6ded906ef0be52a4881ba50a084aeca64d7e.tar.gz linux-b46f6ded906ef0be52a4881ba50a084aeca64d7e.tar.bz2 linux-b46f6ded906ef0be52a4881ba50a084aeca64d7e.zip | |
libnl: nla_put_be64(): align on a 64-bit area
nla_data() is now aligned on a 64-bit area.
A temporary version (nla_put_be64_32bit()) is added for nla_put_net64().
This function is removed in the next patch.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nft_counter.c')
| -rw-r--r-- | net/netfilter/nft_counter.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/netfilter/nft_counter.c b/net/netfilter/nft_counter.c index c9743f78f219..77db8358ab14 100644 --- a/net/netfilter/nft_counter.c +++ b/net/netfilter/nft_counter.c @@ -76,8 +76,10 @@ static int nft_counter_dump(struct sk_buff *skb, const struct nft_expr *expr) nft_counter_fetch(priv->counter, &total); - if (nla_put_be64(skb, NFTA_COUNTER_BYTES, cpu_to_be64(total.bytes)) || - nla_put_be64(skb, NFTA_COUNTER_PACKETS, cpu_to_be64(total.packets))) + if (nla_put_be64(skb, NFTA_COUNTER_BYTES, cpu_to_be64(total.bytes), + NFTA_COUNTER_PAD) || + nla_put_be64(skb, NFTA_COUNTER_PACKETS, cpu_to_be64(total.packets), + NFTA_COUNTER_PAD)) goto nla_put_failure; return 0; |