Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9a08042 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

ipmr: align RTA_MFC_STATS on 64-bit 



Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 58414d32

include/uapi/linux/rtnetlink.h

+1 −0
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ enum rtattr_type_t { 
	RTA_ENCAP_TYPE,

	RTA_ENCAP,

	RTA_EXPIRES,

	RTA_PAD,

	__RTA_MAX

};

net/ipv4/ipmr.c

+2 −2
Original line number Diff line number Diff line
@@ -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;