X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fnetdev-linux.c;h=02d8a4d9aa2241a76b0bfcef741a306c10c44d23;hb=1c2e2d2fc87c9435b6fe33112b0ddaab59f507c5;hp=0aceb45f86a16bb391e9e65de44c8aa215e2d6e0;hpb=71d7c22f54ae32d15133571e09ddf7ab435e8afa;p=openvswitch

diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
index 0aceb45f..02d8a4d9 100644
--- a/lib/netdev-linux.c
+++ b/lib/netdev-linux.c
@@ -2045,6 +2045,7 @@ netdev_linux_arp_lookup(const struct netdev *netdev,
     int retval;
 
     memset(&r, 0, sizeof r);
+    memset(&sin, 0, sizeof sin);
     sin.sin_family = AF_INET;
     sin.sin_addr.s_addr = ip;
     sin.sin_port = 0;
@@ -2496,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 */
@@ -2976,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