diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2016-04-21 18:58:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-21 14:22:13 -0400 |
| commit | 3d6b66c1d1a8d348928996ca333730f258fbb838 (patch) | |
| tree | 515f5e73913a81246590ea7cb1b7a08f5c349eda /net/ipv6 | |
| parent | a9a080422ef7b0c7e69925e4a1474ad93f0f0117 (diff) | |
| download | linux-3d6b66c1d1a8d348928996ca333730f258fbb838.tar.gz linux-3d6b66c1d1a8d348928996ca333730f258fbb838.tar.bz2 linux-3d6b66c1d1a8d348928996ca333730f258fbb838.zip | |
ip6mr: align RTA_MFC_STATS on 64-bit
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6mr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index a10e77103c88..bf678324fd52 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -2268,7 +2268,7 @@ static int __ip6mr_fill_mroute(struct mr6_table *mrt, struct sk_buff *skb, mfcs.mfcs_packets = c->mfc_un.res.pkt; mfcs.mfcs_bytes = c->mfc_un.res.bytes; mfcs.mfcs_wrong_if = c->mfc_un.res.wrong_if; - if (nla_put(skb, RTA_MFC_STATS, sizeof(mfcs), &mfcs) < 0) + if (nla_put_64bit(skb, RTA_MFC_STATS, sizeof(mfcs), &mfcs, RTA_PAD) < 0) return -EMSGSIZE; rtm->rtm_type = RTN_MULTICAST; @@ -2411,7 +2411,7 @@ static int mr6_msgsize(bool unresolved, int maxvif) + nla_total_size(0) /* RTA_MULTIPATH */ + maxvif * NLA_ALIGN(sizeof(struct rtnexthop)) /* RTA_MFC_STATS */ - + nla_total_size(sizeof(struct rta_mfc_stats)) + + nla_total_size_64bit(sizeof(struct rta_mfc_stats)) ; return len; |