summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2012-04-23 22:16:52 +0000
committerOlivier Blin <blino@mageia.org>2012-04-23 22:16:52 +0000
commitc9cf94494c8c53b81656ee8bcdf91cd7a9b538dc (patch)
tree44232dc3718b482ceb72931604825da6dbbd14c2
parent46b76456c947bbbf6a2e3ba2b6337e72cc350044 (diff)
downloaddrakx-net-c9cf94494c8c53b81656ee8bcdf91cd7a9b538dc.tar
drakx-net-c9cf94494c8c53b81656ee8bcdf91cd7a9b538dc.tar.gz
drakx-net-c9cf94494c8c53b81656ee8bcdf91cd7a9b538dc.tar.bz2
drakx-net-c9cf94494c8c53b81656ee8bcdf91cd7a9b538dc.tar.xz
drakx-net-c9cf94494c8c53b81656ee8bcdf91cd7a9b538dc.zip
install ralink-firmware for rt61/73/2860/2870/3090 drivers
-rw-r--r--NEWS1
-rw-r--r--lib/network/connection/wireless.pm33
2 files changed, 9 insertions, 25 deletions
diff --git a/NEWS b/NEWS
index eea92c8..64b10ca 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
- fix iwlagn firmware package installation (#5549) and make
iwl3945/4965 check faster by fixing test file
+- install ralink-firmware for rt61/73/2860/2870/3090 drivers
1.7
- change path to b43 firmware according to kernel changes (#5419)
diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm
index 261390b..0826e7f 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -294,38 +294,21 @@ my @thirdparty_settings = (
no_module_reload => 1,
},
- {
- name => 'rt61',
- matching => 'rt61pci',
- description => 'Ralink RT61 802.11abg WLAN',
- firmware => {
- url => 'http://rt2x00.serialmonkey.com/',
- test_file => 'rt2661.bin',
- },
- },
-
- {
- name => 'rt73',
- matching => 'rt73usb',
- description => 'Ralink RT73 802.11abg WLAN',
- firmware => {
- url => 'http://rt2x00.serialmonkey.com/',
- test_file => 'rt73.bin',
- },
- },
-
(map {
+ my ($version, $suffix) = @$_;
+ $suffix ||= $version;
+{
- name => "rt${_}",
- matching => qr/^rt${_}(sta|)$/,
- description => 'Ralink RT${_} WiFi',
+ name => "rt${version}",
+ matching => qr/^rt${version}(|pci|usb)$/,
+ description => "Ralink RT${version} WiFi",
kernel_module => 1,
firmware => {
+ package => 'ralink-firmware',
url => 'http://www.ralinktech.com/',
- test_file => "rt${_}.bin",
+ test_file => "rt${suffix}.bin",
},
};
- } (2860, 2870, 3090)),
+ } ([ 61, 2661 ], [ 73 ], [ 2860 ], [ 2870 ], [ 3090 ])),
{
name => 'rtl8187se',