Fix use of uninitialized ospeed

If speed can not be determined then ospeed is undef.

1 files changed, 7 insertions, 8 deletions

diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl
index c2ec9a44..30b35c05 100755
--- a/scripts/vyatta-interfaces.pl
+++ b/scripts/vyatta-interfaces.pl
@@ -452,14 +452,13 @@ sub set_speed_duplex {
 
     # read old values to avoid meaningless speed changes
     my ($autoneg, $ospeed, $oduplex) = get_ethtool($intf);
-    if (defined($autoneg)) {
-	if ($autoneg == 1) {
-	    # Device is already in autonegotiation mode
-	    return if ($nspeed eq 'auto');
-	} else {
-	    # Device has explicit speed/duplex but they already match
-	    return if (($nspeed eq $ospeed) && ($nduplex eq $oduplex));
-	}
+
+    if (defined($autoneg) && $autoneg == 1) {
+	# Device is already in autonegotiation mode
+	return if ($nspeed eq 'auto');
+    } elsif (defined($ospeed) && defined($oduplex)) {
+	# Device has explicit speed/duplex but they already match
+	return if (($nspeed eq $ospeed) && ($nduplex eq $oduplex));
     }
 
     my $cmd = "$ETHTOOL -s $intf";