[kernel] r18593 - in dists/trunk/linux-2.6/debian: . installer/modules

[Ben Hutchings]

Author: benh
Date: Thu Jan 19 05:51:50 2012
New Revision: 18593

Log:
udeb: Add missing modules to nic-wireless-modules

Apply patches from Stefan Lippers-Hollmann, originally against kernel-wedge.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/installer/modules/nic-wireless-modules

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Thu Jan 19 05:43:22 2012	(r18592)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Jan 19 05:51:50 2012	(r18593)
@@ -1,6 +1,11 @@
 linux-2.6 (3.2.1-2) UNRELEASED; urgency=low
 
-  * 
+  [ Stefan Lippers-Hollmann ]
+  * udeb: Add missing modules to nic-wireless-modules:
+    - lib80211 encryption algorithms (lib80211_crypt_{wep,ccmptkip})
+      needed for e.g. ipw2x00 wlan modules (Closes: #636259)
+    - ath9k_htc, carl9170 and rt2800{pci,usb} drivers
+      (Closes: #636321, #636351, #636385)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 19 Jan 2012 05:42:57 +0000
 

Modified: dists/trunk/linux-2.6/debian/installer/modules/nic-wireless-modules
==============================================================================
--- dists/trunk/linux-2.6/debian/installer/modules/nic-wireless-modules	Thu Jan 19 05:43:22 2012	(r18592)
+++ dists/trunk/linux-2.6/debian/installer/modules/nic-wireless-modules	Thu Jan 19 05:51:50 2012	(r18593)
@@ -15,18 +15,26 @@
 usb8xxx ?
 ath5k ?
 ath9k ?
+ath9k_htc ?
+carl9170 ?
 iwlwifi ?
 iwl3945 ?
 b43 ?
 brcmsmac ?
 
 # rt2x00 drivers
+rt2400pci ?
 rt2500pci ?
 rt2500usb ?
-rt2400pci ?
+rt2800pci ?
+rt2800usb ?
 rt61pci ?
 rt73usb ?
 
+# lib80211 encryption algorithms
+lib80211_crypt_wep ?
+lib80211_crypt_ccmp ?
+lib80211_crypt_tkip ?
 
 # Crypto modules needed for ieee80211 WEP support
 ecb ?