From a3ec512e2008e7d6dd26d55154206489432d8350 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Tue, 6 Nov 2012 03:50:45 +0000
Subject: [PATCH] udeb: Add various net and SCSI drivers

svn path=/dists/sid/linux/; revision=19480
---
 debian/changelog                              | 11 +++++++++-
 debian/installer/modules/nic-extra-modules    | 21 +++++++++++++++----
 debian/installer/modules/nic-modules          |  5 ++++-
 debian/installer/modules/nic-wireless-modules | 19 +++++++++++++++--
 debian/installer/modules/scsi-common-modules  |  1 +
 debian/installer/modules/scsi-extra-modules   |  3 +++
 6 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 709860472..c7d6a6041 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,7 +29,16 @@ linux (3.2.33-1) UNRELEASED; urgency=low
   * [x86] udeb: Re-add isci to scsi-extra-modules (Closes: #690886;
     regression of #652897 in version 3.2~rc7-1~experimental.1 due to
     mis-merge)
-  * udeb: Add 8021q to nic-extra-modules (Closes: #689159)
+  * udeb: Add missing net drivers:
+    - Add 8021q (Closes: #689159), cxgb4, cxgb4vf, igbvf, int51x1,
+      ixgbevf, micrel, mlx4_en, pch_gbe, qlge, smsc75xx, smsc9420,
+      smsc95xx, tehuti, vxge to nic-extra-modules
+    - Add adm8211, at76c50x-usb, b43legacy, iwl4965, libertas_tf_usb,
+      mwifiex_pcie, mwl8k, orinoco_usb, prism2_usb, r8187se, r8192e_pci,
+      r8712u, rtl8192ce (Closes: #686605), rtl8192cu, rtl8192de, rtl8192se
+      vt6656_stage to nic-wireless-modules
+    - Move broadcom to nic-modules, as it may be needed by tg3
+  * udeb: Add bnx2fc, fnic, pmcraid to scsi-extra-modules
 
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 24 Oct 2012 14:15:57 +0100
 
diff --git a/debian/installer/modules/nic-extra-modules b/debian/installer/modules/nic-extra-modules
index 5aad53078..42191fdc2 100644
--- a/debian/installer/modules/nic-extra-modules
+++ b/debian/installer/modules/nic-extra-modules
@@ -1,5 +1,3 @@
-# Note that this is an incomplete list that tries to be a common subset
-# that is right for most kernels. Suppliment with any others.
 82596 ?
 abyss ?
 ac3200 ?
@@ -103,13 +101,27 @@ jme ?
 enic ?
 be2net ?
 myri10ge ?
-sc92031 ?
+# inet_lro is shared but now only used by myri10ge (and the iw_nes IB driver)
 inet_lro ?
+sc92031 ?
 qlcnic ?
 bna ?
+cxgb4 ?
+cxgb4vf ?
+igbvf ?
+ixgbevf ?
+mlx4_en ?
+vxge ?
+pch_gbe ?
+qlge ?
+smsc9420 ?
+tehuti ?
+int51x1 ?
+smsc75xx ?
+smsc95xx ?
 
 # phy drivers
-broadcom ?
+# broadcom is in nic-modules
 cicada ?
 davicom ?
 et1011c ?
@@ -117,6 +129,7 @@ icplus ?
 lxt ?
 marvell ?
 mdio-bitbang ?
+micrel ?
 national ?
 qsemi ?
 realtek ?
diff --git a/debian/installer/modules/nic-modules b/debian/installer/modules/nic-modules
index 16f0d8c2f..6fc0863ab 100644
--- a/debian/installer/modules/nic-modules
+++ b/debian/installer/modules/nic-modules
@@ -1,4 +1,4 @@
-# Some very common nic modules.
+# Some historically common net drivers
 3c59x
 8139too
 e100
@@ -9,3 +9,6 @@ tulip
 winbond-840
 eth1394 ?
 xen-netfront ?
+
+# PHY driver, may be needed by tg3
+broadcom ?
diff --git a/debian/installer/modules/nic-wireless-modules b/debian/installer/modules/nic-wireless-modules
index 2a981dc24..85f95a5ed 100644
--- a/debian/installer/modules/nic-wireless-modules
+++ b/debian/installer/modules/nic-wireless-modules
@@ -19,10 +19,9 @@ ath9k_htc ?
 carl9170 ?
 iwlwifi ?
 iwl3945 ?
+iwl4965 ?
 b43 ?
 brcmsmac ?
-
-# rt2x00 drivers
 rt2400pci ?
 rt2500pci ?
 rt2500usb ?
@@ -30,6 +29,22 @@ rt2800pci ?
 rt2800usb ?
 rt61pci ?
 rt73usb ?
+adm8211 ?
+at76c50x-usb ?
+b43legacy ?
+libertas_tf_usb ?
+mwifiex_pcie ?
+mwl8k ?
+orinoco_usb ?
+rtl8192ce ?
+rtl8192cu ?
+rtl8192de ?
+rtl8192se ?
+r8187se ?
+r8192e_pci ?
+r8712u ?
+vt6656_stage ?
+prism2_usb ?
 
 # lib80211 encryption algorithms
 lib80211_crypt_wep ?
diff --git a/debian/installer/modules/scsi-common-modules b/debian/installer/modules/scsi-common-modules
index 9baefe5e5..736afe116 100644
--- a/debian/installer/modules/scsi-common-modules
+++ b/debian/installer/modules/scsi-common-modules
@@ -1,3 +1,4 @@
+# Some historically common SCSI drivers
 aic79xx
 aic7xxx
 BusLogic ?
diff --git a/debian/installer/modules/scsi-extra-modules b/debian/installer/modules/scsi-extra-modules
index ee03ecd18..6ab42bc9a 100644
--- a/debian/installer/modules/scsi-extra-modules
+++ b/debian/installer/modules/scsi-extra-modules
@@ -36,6 +36,9 @@ qla4xxx ?
 qla2xxx ?
 pm8001 ?
 isci ?
+bnx2fc ?
+fnic ?
+pmcraid ?
 
 # VMWare
 vmw_pvscsi ?