udeb: nic{,-pcmcia,-usb,-wireless}-modules: Include Ethernet, USB and wireless drivers by default

5 files changed, 80 insertions, 218 deletions

diff --git a/debian/changelog b/debian/changelog
index 8efa0b173faa..509fba1cf48a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ linux (4.4.1-1) UNRELEASED; urgency=medium
   * udeb: Combine scsi-{common,extra}-modules with scsi-modules
   * udeb: Use wildcards to include entire classes of drivers:
     - input-modules: Include HID drivers by default
+    - nic{,-pcmcia,-usb,-wireless}-modules: Include Ethernet, USB and wireless
+      drivers by default
 
   [ Roger Shimizu ]
   * Enable TTY_PRINTK as module (Closes: #814540).
diff --git a/debian/installer/modules/nic-modules b/debian/installer/modules/nic-modules
index 8d35548b2a28..94d0125c2146 100644
--- a/debian/installer/modules/nic-modules
+++ b/debian/installer/modules/nic-modules
@@ -1,118 +1,29 @@
-3c509 ?
-3c515 ?
-3c523 ?
-3c527 ?
-3c59x ?
-8139cp
-8139too
-acenic ?
-alx ?
-amd8111e ?
-arlan ?
-atl1 ?
-atl1c ?
-atl1e ?
-atl2 ?
-be2net ?
-bna ?
-bnx2 ?
-bnx2x ?
-cassini ?
-cs89x0 ?
-cxgb ?
-cxgb3 ?
-cxgb4 ?
-cxgb4vf ?
-de2104x ?
-defxx ?
-dl2k
-dmfe
-e100
-e1000 ?
-e1000e ?
-enic ?
-epic100
-et131x ?
-fealnx
-forcedeth ?
-hamachi
-i40e ?
-igb
-igbvf ?
-ipg ?
-ixgb ?
-ixgbe ?
-ixgbevf ?
-jme ?
-lance ?
-liquidio ?
-mlx4_en ?
-mlx5_core ?
-myri10ge ?
-natsemi
-ne ?
-ne2 ?
-ne2k-pci
-netxen_nic ?
-ni65 ?
-niu ?
-ns83820
-pch_gbe ?
-pcnet32 ?
-qla3xxx ?
-qlcnic ?
-qlge ?
-r6040
-r8169
-rrunner ?
-s2io ?
-sc92031 ?
-sfc
-sis190 ?
-sis900 ?
-skfp
-skge
-sky2
-smc-ultra ?
-smc9194 ?
-smsc9420 ?
-starfire
-sundance
-tehuti ?
-tg3 ?
-tlan ?
-tulip
-typhoon
-uli526x ?
-via-rhine ?
-via-velocity ?
+# Include Ethernet controller and PHY drivers by default
+drivers/net/ethernet/**
+drivers/net/phy/*
+
+# Include paravirtual network drivers with minimal dependencies
 vmxnet3 ?
-vxge ?
-wd ?
-winbond-840
 xen-netfront ?
-yellowfin
 
-# inet_lro is shared but now only used by myri10ge (and the iw_nes IB driver)
-inet_lro ?
+# Include some more obscure network driver types
+drivers/net/fddi/**
+drivers/net/hippi/**
 
-# phy drivers
-broadcom ?
-cicada ?
-davicom ?
-dp83867 ?
-et1011c ?
-icplus ?
-lxt ?
-marvell ?
-mdio-bitbang ?
-micrel ?
-national ?
-qsemi ?
-realtek ?
-smsc ?
-ste10Xp ?
-vitesse ?
+# Include LRO library (obsolete)
+inet_lro
 
-# VLAN
+# Include VLAN driver
 8021q
+
+# Exclude drivers packaged in nic-pcmcia-modules
+drivers/net/**_cs -
+b44 -
+xircom_cb -
+
+# Exclude libraries packaged in nic-{common,shared} modules
+8390 -
+libphy -
+
+# Exclude iSCSI drivers packaged in scsi-modules
+cnic -
diff --git a/debian/installer/modules/nic-pcmcia-modules b/debian/installer/modules/nic-pcmcia-modules
index 50334744da3d..03088c3318c9 100644
--- a/debian/installer/modules/nic-pcmcia-modules
+++ b/debian/installer/modules/nic-pcmcia-modules
@@ -1,19 +1,13 @@
-# Common pcmcia nic modules.
-3c574_cs
-3c589_cs
-airo_cs ?
-axnet_cs
+# Include PCMCIA Ethernet and wireless drivers by default
+drivers/net/ethernet/**_cs
+drivers/net/wireless/**_cs
 b44 ?
-com20020_cs ?
-fmvj18x_cs ?
-netwave_cs ?
-nmclan_cs
-orinoco_cs
-pcnet_cs
-ray_cs
-smc91c92_cs
-wavelan_cs ?
-xirc2ps_cs
+hostap_plx ?
 xircom_cb
-atmel_cs ?
-wl3501_cs ?
+
+# Exclude drivers packaged in nic-wireless-modules
+libertas_cs -
+spectrum_cs -
+
+# Include some more obscure network driver types
+drivers/net/arcnet/**_cs
diff --git a/debian/installer/modules/nic-usb-modules b/debian/installer/modules/nic-usb-modules
index 109aaae852f1..56226e3e56ca 100644
--- a/debian/installer/modules/nic-usb-modules
+++ b/debian/installer/modules/nic-usb-modules
@@ -1,21 +1,21 @@
-# USB wired network modules (USB wireless goes in nic-wireless-modules)
-asix ?
-ax88179_178a ?
-catc
-cdc_ether ?
-dm9601 ?
-g_ether ?
-int51x1 ?
-kaweth
-mcs7830 ?
-pegasus
-r8152 ?
-r815x ?
-rndis_wlan ?
-rtl8150
-rtl8187 ?
-smsc75xx ?
-smsc95xx ?
-usbnet
-zd1201 ?
-zd1211rw ?
+# Include USB wired drivers by default
+drivers/net/usb/*
+
+# Include rndis_wlan, which depends on rndis_host
+rndis_wlan
+
+# Include some other wireless drivers (for no discernable reason)
+rtl8187
+zd1201
+zd1211rw
+
+# Exclude wireless modem drivers which need extra configuration
+cdc_mbim -
+cdc_ncm -
+cdc-phonet -
+hso -
+huawei_cdc_ncm -
+kalmia -
+lg-vl600 -
+qmi_wwan -
+sierra_net -
diff --git a/debian/installer/modules/nic-wireless-modules b/debian/installer/modules/nic-wireless-modules
index f3100d68676e..b03324f7ceee 100644
--- a/debian/installer/modules/nic-wireless-modules
+++ b/debian/installer/modules/nic-wireless-modules
@@ -1,73 +1,28 @@
-adm8211 ?
-ar5523 ?
-at76c50x-usb ?
-ath5k ?
-ath6kl_sdio ?
-ath6kl_usb ?
-ath9k ?
-ath9k_htc ?
-ath10k_core ?
-ath10k_pci ?
-atmel_pci ?
-b43 ?
-b43legacy ?
-brcmfmac ?
-brcmsmac ?
-carl9170 ?
-hermes ?
-hostap_pci ?
-ipw2100 ?
-ipw2200 ?
-iwl3945 ?
-iwl4965 ?
-iwldvm ?
-iwlmvm ?
-iwlwifi ?
+# Include wireless drivers by default
+drivers/net/wireless/**
+
+# Include staging wireless drivers
+prism2_usb
+drivers/staging/rtl8**
+vt6656_stage
+
+# Exclude drivers packaged in nic-pcmcia-modules
+drivers/net/wireless/**_cs -
+airo -
+hostap_plx -
+
+# Don't separate these from their driver families
 libertas_cs ?
-libertas_sdio ?
-libertas_tf_usb ?
-mwifiex_pcie ?
-mwifiex_sdio ?
-mwifiex_usb ?
-mwl8k ?
-orinoco ?
-orinoco_nortel ?
-orinoco_plx ?
-orinoco_tmd ?
-orinoco_usb ?
-p54pci ?
-p54usb
-prism2_usb ?
-prism54 ?
-r8187se ?
-r8192e_pci ?
-r8192u_usb ?
-r8712u ?
-r8723au ?
-rsi_usb ?
-rt2400pci ?
-rt2500pci ?
-rt2500usb ?
-rt2800pci ?
-rt2800usb ?
-rt61pci ?
-rt73usb ?
-rtl8180 ?
-rtl8188ee ?
-rtl8188eu ?
-rtl818x_pci ?
-rtl8192ce ?
-rtl8192cu ?
-rtl8192de ?
-rtl8192se ?
-rtl8723ae ?
-rtl8723be ?
-rtl8821ae ?
 spectrum_cs ?
-usb8xxx ?
-vt6656_stage ?
-wavelan ?
-wil6210 ?
+
+# Exclude drivers packaged in nic-usb-modules
+rndis_wlan -
+rtl8187 -
+zd1201 -
+zd1211rw -
+
+# Exclude debug driver
+mac80211_hwsim -
 
 # lib80211 encryption algorithms
 lib80211_crypt_wep ?