Handle auto bandwidth value better

Need to handle the case of devices that don't know their current speed.
In this case, ethtool will print "Unknown!" which the old code wasn't
handling right.

Move the default speed stuff down into traffic shaper code as well,
so any future policies using auto can make other choices as to what
to do in this case.

Bugfix: 3450

1 files changed, 6 insertions, 5 deletions

diff --git a/scripts/VyattaQosUtil.pm b/scripts/VyattaQosUtil.pm
index eca0ca3..668f5c1 100644
--- a/scripts/VyattaQosUtil.pm
+++ b/scripts/VyattaQosUtil.pm
@@ -235,13 +235,12 @@ sub interfaceRate {
     for (my $retries = 0; $retries < 5; $retries++) {
 	$speed = ethtoolRate($interface);
 	if (defined $speed) {
-	    return $speed;
+	    last;
 	}
 	sleep 1;
     }
 
-    warn "Could not determine speed for $interface, assuming 100mbit\n";
-    return 100 * 1000000;
+    return $speed;
 }
 
 ## ethtoolRate("eth0")
@@ -265,8 +264,10 @@ sub ethtoolRate {
     while (<$ethtool>) {
 	my @line = split;
 	if ($line[0] =~ /^Speed:/) {
-	    $rate = $line[1];
-	    $rate =~ s#Mb/s#000000#;
+	    if ($line[1] =~ /[0-9]+Mb\/s/ ) {
+		$rate = $line[1];
+		$rate =~ s#Mb/s#000000#;
+	    }
 	    last;
 	}
     }