korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-29 15:14:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

sched: use nla_put_u64_64bit()

Browse Source 
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nicolas Dichtel 2016-04-25 10:25:15 +02:00 committed by David S. Miller
parent 343a6d8e49
commit 2a51c1e8ec
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/uapi/linux/pkt_sched.h
View File

@ -179,6 +179,7 @@ enum {
TCA_TBF_PRATE64, TCA_TBF_PRATE64,
TCA_TBF_BURST, TCA_TBF_BURST,
TCA_TBF_PBURST, TCA_TBF_PBURST,
TCA_TBF_PAD,
__TCA_TBF_MAX, __TCA_TBF_MAX,
}; };
@ -368,6 +369,7 @@ enum {
TCA_HTB_DIRECT_QLEN, TCA_HTB_DIRECT_QLEN,
TCA_HTB_RATE64, TCA_HTB_RATE64,
TCA_HTB_CEIL64, TCA_HTB_CEIL64,
TCA_HTB_PAD,
__TCA_HTB_MAX, __TCA_HTB_MAX,
}; };
@ -531,6 +533,7 @@ enum {
TCA_NETEM_RATE, TCA_NETEM_RATE,
TCA_NETEM_ECN, TCA_NETEM_ECN,
TCA_NETEM_RATE64, TCA_NETEM_RATE64,
TCA_NETEM_PAD,
__TCA_NETEM_MAX, __TCA_NETEM_MAX,
}; };

6
net/sched/sch_htb.c
View File

@ -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)) if (nla_put(skb, TCA_HTB_PARMS, sizeof(opt), &opt))
goto nla_put_failure; goto nla_put_failure;
if ((cl->rate.rate_bytes_ps >= (1ULL << 32)) && 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; goto nla_put_failure;
if ((cl->ceil.rate_bytes_ps >= (1ULL << 32)) && 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; goto nla_put_failure;
return nla_nest_end(skb, nest); return nla_nest_end(skb, nest);

3
net/sched/sch_netem.c
View File

@ -994,7 +994,8 @@ static int netem_dump(struct Qdisc *sch, struct sk_buff *skb)
goto nla_put_failure; goto nla_put_failure;
if (q->rate >= (1ULL << 32)) { 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; goto nla_put_failure;
rate.rate = ~0U; rate.rate = ~0U;
} else { } else {

6
net/sched/sch_tbf.c
View File

@ -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)) if (nla_put(skb, TCA_TBF_PARMS, sizeof(opt), &opt))
goto nla_put_failure; goto nla_put_failure;
if (q->rate.rate_bytes_ps >= (1ULL << 32) && 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; goto nla_put_failure;
if (tbf_peak_present(q) && if (tbf_peak_present(q) &&
q->peak.rate_bytes_ps >= (1ULL << 32) && 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; goto nla_put_failure;
return nla_nest_end(skb, nest); return nla_nest_end(skb, nest);