diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-04-29 21:24:02 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-04-29 21:24:02 +0000 |
| commit | 5892fbd160a966c8a062516f52060ac2bec03505 (patch) | |
| tree | 8ebd755da16b56336dfc5fb437b8ca5026057d60 /lib/network/connection/ethernet.pm | |
| parent | 242d8ef174659c76d0a5095cfe75c54f789eaca2 (diff) | |
| download | drakx-net-5892fbd160a966c8a062516f52060ac2bec03505.tar drakx-net-5892fbd160a966c8a062516f52060ac2bec03505.tar.gz drakx-net-5892fbd160a966c8a062516f52060ac2bec03505.tar.bz2 drakx-net-5892fbd160a966c8a062516f52060ac2bec03505.tar.xz drakx-net-5892fbd160a966c8a062516f52060ac2bec03505.zip | |
make modules_conf optional when finding interface driver
Diffstat (limited to 'lib/network/connection/ethernet.pm')
| -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 0c9f3c1..81592e1 100644 --- a/lib/network/connection/ethernet.pm +++ b/lib/network/connection/ethernet.pm @@ -394,7 +394,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) = @_; detect_devices::probeall_update_cache(); my @all_cards = detect_devices::get_lan_interfaces(); @@ -410,9 +410,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: |