diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-02-22 11:50:17 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-02-22 11:50:17 +0000 |
| commit | e3a64aac70be596ba94de43ec53613824cd22e59 (patch) | |
| tree | 7711c6561fe41e22ffc5d078018d6684ad477df4 /lib/network/ndiswrapper.pm | |
| parent | cf143f5f5df9b4dbf6c9e191e7d5d96e420b5028 (diff) | |
| download | drakx-net-e3a64aac70be596ba94de43ec53613824cd22e59.tar drakx-net-e3a64aac70be596ba94de43ec53613824cd22e59.tar.gz drakx-net-e3a64aac70be596ba94de43ec53613824cd22e59.tar.bz2 drakx-net-e3a64aac70be596ba94de43ec53613824cd22e59.tar.xz drakx-net-e3a64aac70be596ba94de43ec53613824cd22e59.zip | |
always mark the original driver as conflicting with ndiswrapper if it is loaded
Diffstat (limited to 'lib/network/ndiswrapper.pm')
| -rw-r--r-- | lib/network/ndiswrapper.pm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/network/ndiswrapper.pm b/lib/network/ndiswrapper.pm index efd2dc5..c2fa73f 100644 --- a/lib/network/ndiswrapper.pm +++ b/lib/network/ndiswrapper.pm @@ -63,6 +63,10 @@ sub find_matching_devices { } } + #- add original driver + push @devices, { interface => undef, drivers => [ $device->{driver} ] } + if !$is_driver_listed->($device->{driver}) && any { $_ eq $device->{driver} } modules::loaded_modules(); + @devices; } |