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

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

sched: use nla_put_u64_64bit() 



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

include/uapi/linux/pkt_sched.h

+3 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ enum { 
	TCA_TBF_PRATE64,

	TCA_TBF_BURST,

	TCA_TBF_PBURST,

	TCA_TBF_PAD,

	__TCA_TBF_MAX,

};
@@ -368,6 +369,7 @@ enum { 
	TCA_HTB_DIRECT_QLEN,

	TCA_HTB_RATE64,

	TCA_HTB_CEIL64,

	TCA_HTB_PAD,

	__TCA_HTB_MAX,

};
@@ -531,6 +533,7 @@ enum { 
	TCA_NETEM_RATE,

	TCA_NETEM_ECN,

	TCA_NETEM_RATE64,

	TCA_NETEM_PAD,

	__TCA_NETEM_MAX,

};

net/sched/sch_htb.c

+4 −2
Original line number Diff line number Diff line
@@ -1122,10 +1122,12 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg, 
	if (nla_put(skb, TCA_HTB_PARMS, sizeof(opt), &opt))

		goto nla_put_failure;

	if ((cl->rate.rate_bytes_ps >= (1ULL << 32)) &&

	    nla_put_u64(skb, TCA_HTB_RATE64, cl->rate.rate_bytes_ps))

	    nla_put_u64_64bit(skb, TCA_HTB_RATE64, cl->rate.rate_bytes_ps,

			      TCA_HTB_PAD))

		goto nla_put_failure;

	if ((cl->ceil.rate_bytes_ps >= (1ULL << 32)) &&

	    nla_put_u64(skb, TCA_HTB_CEIL64, cl->ceil.rate_bytes_ps))

	    nla_put_u64_64bit(skb, TCA_HTB_CEIL64, cl->ceil.rate_bytes_ps,

			      TCA_HTB_PAD))

		goto nla_put_failure;



	return nla_nest_end(skb, nest);

net/sched/sch_netem.c

+2 −1
Original line number Diff line number Diff line
@@ -994,7 +994,8 @@ static int netem_dump(struct Qdisc *sch, struct sk_buff *skb) 
		goto nla_put_failure;



	if (q->rate >= (1ULL << 32)) {

		if (nla_put_u64(skb, TCA_NETEM_RATE64, q->rate))

		if (nla_put_u64_64bit(skb, TCA_NETEM_RATE64, q->rate,

				      TCA_NETEM_PAD))

			goto nla_put_failure;

		rate.rate = ~0U;

	} else {

net/sched/sch_tbf.c

+4 −2
Original line number Diff line number Diff line
@@ -472,11 +472,13 @@ static int tbf_dump(struct Qdisc *sch, struct sk_buff *skb) 
	if (nla_put(skb, TCA_TBF_PARMS, sizeof(opt), &opt))

		goto nla_put_failure;

	if (q->rate.rate_bytes_ps >= (1ULL << 32) &&

	    nla_put_u64(skb, TCA_TBF_RATE64, q->rate.rate_bytes_ps))

	    nla_put_u64_64bit(skb, TCA_TBF_RATE64, q->rate.rate_bytes_ps,

			      TCA_TBF_PAD))

		goto nla_put_failure;

	if (tbf_peak_present(q) &&

	    q->peak.rate_bytes_ps >= (1ULL << 32) &&

	    nla_put_u64(skb, TCA_TBF_PRATE64, q->peak.rate_bytes_ps))

	    nla_put_u64_64bit(skb, TCA_TBF_PRATE64, q->peak.rate_bytes_ps,

			      TCA_TBF_PAD))

		goto nla_put_failure;



	return nla_nest_end(skb, nest);