From 29141c7cf499bddd75b6ca33b63046890e0664a7 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 15 Mar 2004 09:59:47 +0000
Subject: (mapIntfToDevice) do not try to match a physical device when
 SIOCETHTOOL ioctl is not supported

---
 perl-install/network/ethernet.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'perl-install/network/ethernet.pm')

diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index fc53e28a5..5e95e25c8 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -37,8 +37,9 @@ qq(
 
 sub mapIntfToDevice {
     my ($interface) = @_;
-    my ($bus, $slot, $func) = map { hex($_) } (c::getHwIDs($interface) =~ /([0-9a-f]+):([0-9a-f]+)\.([0-9a-f]+)/);
-    grep { $_->{pci_bus} == $bus && $_->{pci_device} == $slot && $_->{pci_function} == $func } detect_devices::probeall();
+    my $hw_addr = c::getHwIDs($interface);
+    my ($bus, $slot, $func) = map { hex($_) } ($hw_addr =~ /([0-9a-f]+):([0-9a-f]+)\.([0-9a-f]+)/);
+    $hw_addr ? grep { $_->{pci_bus} == $bus && $_->{pci_device} == $slot && $_->{pci_function} == $func } detect_devices::probeall() : {};
 }
 
 
-- 
cgit v1.2.1