diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-05-12 12:23:38 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-05-12 12:23:38 +0000 |
| commit | 0b5def01271c34d72f0303c2af94a1df9ef10dc3 (patch) | |
| tree | d334bace094e70b2b261b23b5accc7afe1f8a806 | |
| parent | 84f028f653601c174cdf1252c1d5a92b2691bf0f (diff) | |
| download | drakx-net-0b5def01271c34d72f0303c2af94a1df9ef10dc3.tar drakx-net-0b5def01271c34d72f0303c2af94a1df9ef10dc3.tar.gz drakx-net-0b5def01271c34d72f0303c2af94a1df9ef10dc3.tar.bz2 drakx-net-0b5def01271c34d72f0303c2af94a1df9ef10dc3.tar.xz drakx-net-0b5def01271c34d72f0303c2af94a1df9ef10dc3.zip | |
make modules_conf parameter optional in get_eth_cards
| -rw-r--r-- | lib/network/connection/ethernet.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/network/connection/ethernet.pm b/lib/network/connection/ethernet.pm index 0fc5f58..29c6be9 100644 --- a/lib/network/connection/ethernet.pm +++ b/lib/network/connection/ethernet.pm @@ -386,7 +386,7 @@ sub interface_to_driver { # - hotplug managed devices (USB, firewire) # - special interfaces (IP aliasing, VLAN) sub get_eth_cards { - my ($modules_conf) = @_; + my ($o_modules_conf) = @_; my @all_cards = detect_devices::get_lan_interfaces(); my @devs = detect_devices::pcmcia_probe(); @@ -400,9 +400,9 @@ sub get_eth_cards { $a = c::getNetDriver($interface); if ($a) { $detected_through_ethtool = 1; - } else { + } elsif ($o_modules_conf) { # 2) get interface's driver through module aliases: - $a = $modules_conf->get_alias($interface); + $a = $o_modules_conf->get_alias($interface); } # workaround buggy drivers that returns a bogus driver name for the GDRVINFO command of the ETHTOOL ioctl: |