diff options
author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2016-04-21 12:58:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-21 14:22:13 -0400 |
commit | 3d6b66c1d1a8d348928996ca333730f258fbb838 (patch) | |
tree | 515f5e73913a81246590ea7cb1b7a08f5c349eda | |
parent | a9a080422ef7b0c7e69925e4a1474ad93f0f0117 (diff) |
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>
-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, | |||
2268 | mfcs.mfcs_packets = c->mfc_un.res.pkt; | 2268 | mfcs.mfcs_packets = c->mfc_un.res.pkt; |
2269 | mfcs.mfcs_bytes = c->mfc_un.res.bytes; | 2269 | mfcs.mfcs_bytes = c->mfc_un.res.bytes; |
2270 | mfcs.mfcs_wrong_if = c->mfc_un.res.wrong_if; | 2270 | mfcs.mfcs_wrong_if = c->mfc_un.res.wrong_if; |
2271 | if (nla_put(skb, RTA_MFC_STATS, sizeof(mfcs), &mfcs) < 0) | 2271 | if (nla_put_64bit(skb, RTA_MFC_STATS, sizeof(mfcs), &mfcs, RTA_PAD) < 0) |
2272 | return -EMSGSIZE; | 2272 | return -EMSGSIZE; |
2273 | 2273 | ||
2274 | rtm->rtm_type = RTN_MULTICAST; | 2274 | rtm->rtm_type = RTN_MULTICAST; |
@@ -2411,7 +2411,7 @@ static int mr6_msgsize(bool unresolved, int maxvif) | |||
2411 | + nla_total_size(0) /* RTA_MULTIPATH */ | 2411 | + nla_total_size(0) /* RTA_MULTIPATH */ |
2412 | + maxvif * NLA_ALIGN(sizeof(struct rtnexthop)) | 2412 | + maxvif * NLA_ALIGN(sizeof(struct rtnexthop)) |
2413 | /* RTA_MFC_STATS */ | 2413 | /* RTA_MFC_STATS */ |
2414 | + nla_total_size(sizeof(struct rta_mfc_stats)) | 2414 | + nla_total_size_64bit(sizeof(struct rta_mfc_stats)) |
2415 | ; | 2415 | ; |
2416 | 2416 | ||
2417 | return len; | 2417 | return len; |