summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-02-22 11:45:27 +0000
committerOlivier Blin <oblin@mandriva.com>2008-02-22 11:45:27 +0000
commitfaa57b8b6a468f63904c16e3689dfb7dfd6e9306 (patch)
treeb02154427c046755c5495785f742c189a180e40d
parent6d534bcf50a61f4329c77bfb2383d40476965c36 (diff)
downloaddrakx-net-faa57b8b6a468f63904c16e3689dfb7dfd6e9306.tar
drakx-net-faa57b8b6a468f63904c16e3689dfb7dfd6e9306.tar.gz
drakx-net-faa57b8b6a468f63904c16e3689dfb7dfd6e9306.tar.bz2
drakx-net-faa57b8b6a468f63904c16e3689dfb7dfd6e9306.tar.xz
drakx-net-faa57b8b6a468f63904c16e3689dfb7dfd6e9306.zip
unload drivers for all conflicting interfaces
-rw-r--r--lib/network/ndiswrapper.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/network/ndiswrapper.pm b/lib/network/ndiswrapper.pm
index 6251a35..6e21bb2 100644
--- a/lib/network/ndiswrapper.pm
+++ b/lib/network/ndiswrapper.pm
@@ -83,7 +83,8 @@ sub setup_device {
$in->ask_yesorno(N("Warning"), N("The selected device has already been configured with the %s driver.
Do you really want to use a ndiswrapper driver?", $conflicts[0]->{drivers}[0])) or return;
#- unload the old module and try immediately to load ndiswrapper
- eval { modules::unload($_) } foreach @{$conflicts[0]->{drivers}};
+ my @drivers = map { @{$_->{drivers}} } @conflicts;
+ eval { modules::unload($_) } foreach @drivers;
}
#- unload ndiswrapper first so that the newly installed .inf files will be read