diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2016-04-21 18:58:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-21 20:22:13 +0200 |
| commit | a9a080422ef7b0c7e69925e4a1474ad93f0f0117 (patch) | |
| tree | 37af2215d50e78ed4fe3b4665790610dbdd3c839 /net/ipv4/ipmr.c | |
| parent | rtnl: use the new API to align IFLA_STATS* (diff) | |
| download | linux-a9a080422ef7b0c7e69925e4a1474ad93f0f0117.tar.xz linux-a9a080422ef7b0c7e69925e4a1474ad93f0f0117.zip | |
ipmr: 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/ipv4/ipmr.c')
| -rw-r--r-- | net/ipv4/ipmr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 395e2814a46d..21a38e296fe2 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -2104,7 +2104,7 @@ static int __ipmr_fill_mroute(struct mr_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; @@ -2237,7 +2237,7 @@ static size_t mroute_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; |