From patchwork Thu Aug 11 00:01:53 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: UBUNTU: Deliver more Atheros, Ralink, and iwlagn NIC drivers to d-i
Date: Wed, 10 Aug 2011 14:01:53 -0000
From: Colin Watson <cjwatson@ubuntu.com>
X-Patchwork-Id: 109479
Message-Id: <20110811000153.GE10212@riva.dynamic.greenend.org.uk>
To: kernel-team@lists.ubuntu.com

d-i now supports WPA in Oneiric.  While soliciting testing of this, I
heard from testers with Atheros, Ralink, and Intel AGN chipsets, none of
whom were able to test WPA support in d-i because the relevant drivers
weren't delivered to d-i.

This patch adds these drivers to nic-modules or nic-usb-modules as
appropriate.

Signed-off-by: Colin Watson <cjwatson@canonical.com>

---
debian.master/d-i/modules/nic-modules        |    6 ++++++
 debian.master/d-i/modules/nic-shared-modules |    4 ++++
 debian.master/d-i/modules/nic-usb-modules    |    3 +++
 3 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/debian.master/d-i/modules/nic-modules b/debian.master/d-i/modules/nic-modules
index 6ea60b1..d0da1f8 100644
--- a/debian.master/d-i/modules/nic-modules
+++ b/debian.master/d-i/modules/nic-modules
@@ -23,6 +23,9 @@ arc-rawmode ?
 arc-rimi ?
 arlan ?
 at1700 ?
+ath5k ?
+ath9k ?
+ath9k_htc ?
 atl1 ?
 atl1c ?
 atl1e ?
@@ -113,7 +116,10 @@ rfc1051 ?
 rfc1201 ?
 rrunner ?
 rt2400 ?
+rt2400pci ?
 rt2500 ?
+rt2500pci ?
+rt2800pci ?
 rt61pci ?
 s2io ?
 shaper ?
diff --git a/debian.master/d-i/modules/nic-shared-modules b/debian.master/d-i/modules/nic-shared-modules
index e33885f..0ee15aa 100644
--- a/debian.master/d-i/modules/nic-shared-modules
+++ b/debian.master/d-i/modules/nic-shared-modules
@@ -13,6 +13,10 @@ cfg80211 ?
 
 # rt2x00 lib (since rt2x00 is split across usb/pci/cb
 rt2x00lib ?
+rt2800lib ?
+
+# Atheros library (since drivers are split across nic-modules/nic-usb-modules)
+ath ?
 
 # Wireless 802.11 modules
 lib80211 ?
diff --git a/debian.master/d-i/modules/nic-usb-modules b/debian.master/d-i/modules/nic-usb-modules
index e931c01..06a40f9 100644
--- a/debian.master/d-i/modules/nic-usb-modules
+++ b/debian.master/d-i/modules/nic-usb-modules
@@ -9,6 +9,8 @@ zd1201 ?
 rt2500usb ?
 rt73usb ?
 rt2570 ?
+rt2800usb ?
+rt2x00usb ?
 cdc_ether ?
 asix ?
 cdc_eem ?
@@ -25,3 +27,4 @@ plusb ?
 rndis_host ?
 smsc95xx ?
 zaurus ?
+carl9170 ?