diff options
| author | Bob Gilligan <gilligan@vyatta.com> | 2010-03-09 15:52:24 -0800 |
|---|---|---|
| committer | Bob Gilligan <gilligan@vyatta.com> | 2010-03-09 15:52:24 -0800 |
| commit | ddbef54cd41e417cacf417b013b79bd8dac75102 (patch) | |
| tree | 819aed0e1405280f36aa3d13062a04872c89b3a4 | |
| parent | 697ce5a4ab6866b167374c2928ee532d64cc05d1 (diff) | |
| download | vyatta-cfg-ddbef54cd41e417cacf417b013b79bd8dac75102.tar.gz vyatta-cfg-ddbef54cd41e417cacf417b013b79bd8dac75102.zip | |
Bugfix 5021: Make smp_affinity configuration tolerant of failures.
| -rw-r--r-- | scripts/vyatta-auto-irqaffin.pl | 6 | ||||
| -rwxr-xr-x | scripts/vyatta-irqaffin | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/scripts/vyatta-auto-irqaffin.pl b/scripts/vyatta-auto-irqaffin.pl index 8ba17ff..7f5fe22 100644 --- a/scripts/vyatta-auto-irqaffin.pl +++ b/scripts/vyatta-auto-irqaffin.pl @@ -342,9 +342,13 @@ if (defined $setup_ifname) { # one used by Broadcom NICs. $driver_style="broadcom"; } - } else { + } elsif ($numints == 1) { # It is a single queue NIC. $driver_style="single"; + } else { + # $numints must be 0 + printf("Unable to determine IRQs for interface $ifname.\n"); + exit 0; } $driver_func = $driver_hash{$driver_style}; diff --git a/scripts/vyatta-irqaffin b/scripts/vyatta-irqaffin index a6b7b22..9330d4d 100755 --- a/scripts/vyatta-irqaffin +++ b/scripts/vyatta-irqaffin @@ -53,7 +53,7 @@ get_irqnums() { irqnums=`grep $1 /proc/interrupts | awk -F ': ' '{ print $1 }'` if [ -z "$irqnums" ]; then - echo "Invalid interface name: $1" + echo "Unable to determine IRQs for interface $1" return 1 fi return 0 |