summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Harpin <development@landsofshadow.co.uk>2015-11-03 23:04:37 +0000
committerAlex Harpin <development@landsofshadow.co.uk>2015-11-03 23:04:37 +0000
commit4546c16e3070b829a0e920f57c1a24ae8948fdc7 (patch)
treee3729316ef93bf19ee487ba7904ced88e9ab451f
parent29b46f8b85f5b76130bb723a28001fdfb9c9b422 (diff)
downloadvyatta-cfg-system-4546c16e3070b829a0e920f57c1a24ae8948fdc7.tar.gz
vyatta-cfg-system-4546c16e3070b829a0e920f57c1a24ae8948fdc7.zip
vyatta-cfg-system: rename smp_affinity to smp-affinity
Rename the smp_affinity config option to smp-affinity in line with the standard option naming convention. Bug #18 http://bugzilla.vyos.net/show_bug.cgi?id=18
-rwxr-xr-xscripts/vyatta-bonding.pl4
-rw-r--r--templates/interfaces/ethernet/node.tag/disable/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/smp-affinity/node.def (renamed from templates/interfaces/ethernet/node.tag/smp_affinity/node.def)2
3 files changed, 4 insertions, 4 deletions
diff --git a/scripts/vyatta-bonding.pl b/scripts/vyatta-bonding.pl
index aa733b61..9c9eb995 100755
--- a/scripts/vyatta-bonding.pl
+++ b/scripts/vyatta-bonding.pl
@@ -139,7 +139,7 @@ sub get_irq_affinity {
return;
}
$cfg->setLevel($slaveif->path());
- return $cfg->returnValue('smp_affinity');
+ return $cfg->returnValue('smp-affinity');
}
sub if_down {
@@ -156,7 +156,7 @@ sub if_up {
my $smp_affinity = get_irq_affinity($intf);
if ($smp_affinity) {
system "/opt/vyatta/sbin/irq-affinity.pl $intf $smp_affinity"
- and warn "Could not set $intf smp_affinity $smp_affinity\n";
+ and warn "Could not set $intf smp-affinity $smp_affinity\n";
}
}
diff --git a/templates/interfaces/ethernet/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/disable/node.def
index c3f9a9a0..fff51388 100644
--- a/templates/interfaces/ethernet/node.tag/disable/node.def
+++ b/templates/interfaces/ethernet/node.tag/disable/node.def
@@ -12,5 +12,5 @@ delete: [ -d /sys/class/net/$VAR(../@) ] || exit 0
echo "Error enabling dev $VAR(../@)"
exit 1
fi
- affinity=$VAR(../smp_affinity/@)
+ affinity=$VAR(../smp-affinity/@)
sudo /opt/vyatta/sbin/irq-affinity.pl $VAR(../@) ${affinity:-auto}
diff --git a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def b/templates/interfaces/ethernet/node.tag/smp-affinity/node.def
index 1f8a2610..59a8997c 100644
--- a/templates/interfaces/ethernet/node.tag/smp_affinity/node.def
+++ b/templates/interfaces/ethernet/node.tag/smp-affinity/node.def
@@ -1,6 +1,6 @@
#
#
-# Configuration template for interface.ethernet.name.smp_affinity
+# Configuration template for interface.ethernet.name.smp-affinity
#
# Configure the CPUs that the associated interface will interrupt.
# SMP affinity is configured by a hexidecimal bitmask that specifies the