summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-10-12 04:02:04 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-10-12 04:02:04 +0000
commit499e29965d6131dbb3d7d9c102dc4f096b4f582d (patch)
treeb0a1aa0fe7b785e77a22abbfbbc63e0e32886bb5
parentc218a2d075c2caa3327559237f3230258d750009 (diff)
downloaddrakx-backup-do-not-use-499e29965d6131dbb3d7d9c102dc4f096b4f582d.tar
drakx-backup-do-not-use-499e29965d6131dbb3d7d9c102dc4f096b4f582d.tar.gz
drakx-backup-do-not-use-499e29965d6131dbb3d7d9c102dc4f096b4f582d.tar.bz2
drakx-backup-do-not-use-499e29965d6131dbb3d7d9c102dc4f096b4f582d.tar.xz
drakx-backup-do-not-use-499e29965d6131dbb3d7d9c102dc4f096b4f582d.zip
(get_eth_cards) workaround more buggy drivers that returns a bogus driver name for the GDRVINFO command of the ETHTOOL ioctl
-rw-r--r--perl-install/network/ethernet.pm5
1 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 600ec2c99..84a7db7c5 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -58,11 +58,16 @@ sub get_eth_cards {
my $description;
# 0) get interface's driver through ETHTOOL ioctl or module aliases:
my $a = c::getNetDriver($interface) || $modules_conf->get_alias($interface);
+
+ # workaround buggy drivers that returns a bogus driver name for the GDRVINFO command of the ETHTOOL ioctl:
my %fixes = (
+ "p80211_prism2_cs" => 'prism2_cs',
+ "p80211_prism2_pci" => 'prism2_pci',
"p80211_prism2_usb" => 'prism2_usb',
"ip1394" => "eth1394",
);
$a = $fixes{$a} if $fixes{$a};
+
# 1) try to match a PCMCIA device for device description:
if (my $b = find { $_->{device} eq $interface } @devs) { # PCMCIA case
$a = $b->{driver};