summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-12-01 23:07:34 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-12-01 23:07:34 -0800
commit4f41b12ea1ffc18452828cddf64c7d87fa57bd0f (patch)
tree0106d3490fe8e44e224fd3fcc983b42c2cb67521 /scripts
parent2193c5b5563981401df3885665e6d146b6f0047a (diff)
parent9f895b22a3bc51a27eb3a7de51a86826e8265bda (diff)
downloadvyatta-op-4f41b12ea1ffc18452828cddf64c7d87fa57bd0f.tar.gz
vyatta-op-4f41b12ea1ffc18452828cddf64c7d87fa57bd0f.zip
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-op into jenner
Conflicts: scripts/vyatta-show-interfaces.pl
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/vyatta-show-interfaces.pl6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/vyatta-show-interfaces.pl b/scripts/vyatta-show-interfaces.pl
index 988b0b5..02ad8e0 100755
--- a/scripts/vyatta-show-interfaces.pl
+++ b/scripts/vyatta-show-interfaces.pl
@@ -115,7 +115,7 @@ sub get_intf_stats {
my %stats = ();
foreach my $var (@rx_stat_vars, @tx_stat_vars) {
- $stats{$var} = Vyatta::Misc::get_sysfs_value($intf, "statistics/$var");
+ $stats{$var} = get_sysfs_value($intf, "statistics/$var");
}
return %stats;
}
@@ -178,12 +178,12 @@ sub get_state_link {
my $intf = shift;
my $state;
my $link = 'down';
- my $flags = Vyatta::Misc::get_sysfs_value($intf, 'flags');
+ my $flags = get_sysfs_value($intf, 'flags');
my $hex_flags = hex($flags);
if ($hex_flags & 0x1) { # IFF_UP
$state = 'up';
- my $carrier = Vyatta::Misc::get_sysfs_value($intf, 'carrier');
+ my $carrier = get_sysfs_value($intf, 'carrier');
if ($carrier eq '1') {
$link = "up";
}