X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fnetdev-linux.c;h=02d8a4d9aa2241a76b0bfcef741a306c10c44d23;hb=1c2e2d2fc87c9435b6fe33112b0ddaab59f507c5;hp=a27a625f8b1d4af811f732a3e9c77041c21ff8ec;hpb=f2cc621bacf07a48e65e163e3420c7594fd65cfd;p=openvswitch diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index a27a625f..02d8a4d9 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -2497,13 +2497,10 @@ htb_parse_class_details__(struct netdev *netdev, return EINVAL; } - /* min-rate. Don't allow a min-rate below 1500 bytes/s. */ - if (!min_rate_s) { - /* min-rate is required. */ - return EINVAL; - } - hc->min_rate = strtoull(min_rate_s, NULL, 10) / 8; - hc->min_rate = MAX(hc->min_rate, 1500); + /* HTB requires at least an mtu sized min-rate to send any traffic even + * on uncongested links. */ + hc->min_rate = min_rate_s ? strtoull(min_rate_s, NULL, 10) / 8 : 0; + hc->min_rate = MAX(hc->min_rate, mtu); hc->min_rate = MIN(hc->min_rate, htb->max_rate); /* max-rate */ @@ -2977,12 +2974,8 @@ hfsc_parse_class_details__(struct netdev *netdev, min_rate_s = shash_find_data(details, "min-rate"); max_rate_s = shash_find_data(details, "max-rate"); - if (!min_rate_s) { - return EINVAL; - } - - min_rate = strtoull(min_rate_s, NULL, 10) / 8; - min_rate = MAX(min_rate, 1500); + min_rate = min_rate_s ? strtoull(min_rate_s, NULL, 10) / 8 : 0; + min_rate = MAX(min_rate, 1); min_rate = MIN(min_rate, hfsc->max_rate); max_rate = (max_rate_s