mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00
Code Issues Releases Wiki Activity

netdev-linux: Fix wrong ceil rate when max-rate less than 8bit.

Browse Source 
When max-rate is less than 8bit, the hc->max_rate will be set
as htb->max_rate mistakenly instead of mtu of netdev.

Fixes: 13c1637 ("smap: New function smap_get_ullong().")
Signed-off-by: Kaige Fu <fukaige@huawei.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
This commit is contained in:
Kaige Fu
2017-11-02 11:07:02 +08:00
committed by Ben Pfaff
parent 274cd1f188
commit 214117fdbd
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/netdev-linux.c
View File

@@ -3762,6 +3762,7 @@ htb_parse_class_details__(struct netdev *netdev,
{
const struct htb *htb = htb_get__(netdev);
int mtu, error;
unsigned long long int max_rate_bit;
error = netdev_linux_get_mtu__(netdev_linux_cast(netdev), &mtu);
if (error) {
@@ -3777,10 +3778,8 @@ htb_parse_class_details__(struct netdev *netdev,
hc->min_rate = MIN(hc->min_rate, htb->max_rate);
/* max-rate */
hc->max_rate = smap_get_ullong(details, "max-rate", 0) / 8;
if (!hc->max_rate) {
hc->max_rate = htb->max_rate;
}
max_rate_bit = smap_get_ullong(details, "max-rate", 0);
hc->max_rate = max_rate_bit ? max_rate_bit / 8 : htb->max_rate;
hc->max_rate = MAX(hc->max_rate, hc->min_rate);
hc->max_rate = MIN(hc->max_rate, htb->max_rate);