Author: thompsa
Date: Sun Jul 11 23:54:44 2010
New Revision: 209918
URL: http://svn.freebsd.org/changeset/base/209918

Log:
  Use more compact deviceid table.
  
  Submitted by: Akinori Furukoshi

Modified:
  head/sys/dev/usb/wlan/if_run.c

Modified: head/sys/dev/usb/wlan/if_run.c
==============================================================================
--- head/sys/dev/usb/wlan/if_run.c      Sun Jul 11 23:52:12 2010        
(r209917)
+++ head/sys/dev/usb/wlan/if_run.c      Sun Jul 11 23:54:44 2010        
(r209918)
@@ -97,199 +97,201 @@ SYSCTL_INT(_hw_usb_run, OID_AUTO, debug,
 #define RUN_CMDQ_GET(c)        (atomic_fetchadd_32((c), 1) & RUN_CMDQ_MASQ)
 
 static const struct usb_device_id run_devs[] = {
-    { USB_VP(USB_VENDOR_ABOCOM,                USB_PRODUCT_ABOCOM_RT2770) },
-    { USB_VP(USB_VENDOR_ABOCOM,                USB_PRODUCT_ABOCOM_RT2870) },
-    { USB_VP(USB_VENDOR_ABOCOM,                USB_PRODUCT_ABOCOM_RT3070) },
-    { USB_VP(USB_VENDOR_ABOCOM,                USB_PRODUCT_ABOCOM_RT3071) },
-    { USB_VP(USB_VENDOR_ABOCOM,                USB_PRODUCT_ABOCOM_RT3072) },
-    { USB_VP(USB_VENDOR_ABOCOM2,       USB_PRODUCT_ABOCOM2_RT2870_1) },
-    { USB_VP(USB_VENDOR_ACCTON,                USB_PRODUCT_ACCTON_RT2770) },
-    { USB_VP(USB_VENDOR_ACCTON,                USB_PRODUCT_ACCTON_RT2870_1) },
-    { USB_VP(USB_VENDOR_ACCTON,                USB_PRODUCT_ACCTON_RT2870_2) },
-    { USB_VP(USB_VENDOR_ACCTON,                USB_PRODUCT_ACCTON_RT2870_3) },
-    { USB_VP(USB_VENDOR_ACCTON,                USB_PRODUCT_ACCTON_RT2870_4) },
-    { USB_VP(USB_VENDOR_ACCTON,                USB_PRODUCT_ACCTON_RT2870_5) },
-    { USB_VP(USB_VENDOR_ACCTON,                USB_PRODUCT_ACCTON_RT3070) },
-    { USB_VP(USB_VENDOR_ACCTON,                USB_PRODUCT_ACCTON_RT3070_1) },
-    { USB_VP(USB_VENDOR_ACCTON,                USB_PRODUCT_ACCTON_RT3070_2) },
-    { USB_VP(USB_VENDOR_ACCTON,                USB_PRODUCT_ACCTON_RT3070_3) },
-    { USB_VP(USB_VENDOR_ACCTON,                USB_PRODUCT_ACCTON_RT3070_4) },
-    { USB_VP(USB_VENDOR_ACCTON,                USB_PRODUCT_ACCTON_RT3070_5) },
-    { USB_VP(USB_VENDOR_AIRTIES,       USB_PRODUCT_AIRTIES_RT3070) },
-    { USB_VP(USB_VENDOR_ALLWIN,                USB_PRODUCT_ALLWIN_RT2070) },
-    { USB_VP(USB_VENDOR_ALLWIN,                USB_PRODUCT_ALLWIN_RT2770) },
-    { USB_VP(USB_VENDOR_ALLWIN,                USB_PRODUCT_ALLWIN_RT2870) },
-    { USB_VP(USB_VENDOR_ALLWIN,                USB_PRODUCT_ALLWIN_RT3070) },
-    { USB_VP(USB_VENDOR_ALLWIN,                USB_PRODUCT_ALLWIN_RT3071) },
-    { USB_VP(USB_VENDOR_ALLWIN,                USB_PRODUCT_ALLWIN_RT3072) },
-    { USB_VP(USB_VENDOR_ALLWIN,                USB_PRODUCT_ALLWIN_RT3572) },
-    { USB_VP(USB_VENDOR_AMIGO,         USB_PRODUCT_AMIGO_RT2870_1) },
-    { USB_VP(USB_VENDOR_AMIGO,         USB_PRODUCT_AMIGO_RT2870_2) },
-    { USB_VP(USB_VENDOR_AMIT,          USB_PRODUCT_AMIT_CGWLUSB2GNR) },
-    { USB_VP(USB_VENDOR_AMIT,          USB_PRODUCT_AMIT_RT2870_1) },
-    { USB_VP(USB_VENDOR_AMIT2,         USB_PRODUCT_AMIT2_RT2870) },
-    { USB_VP(USB_VENDOR_ASUS,          USB_PRODUCT_ASUS_RT2870_1) },
-    { USB_VP(USB_VENDOR_ASUS,          USB_PRODUCT_ASUS_RT2870_2) },
-    { USB_VP(USB_VENDOR_ASUS,          USB_PRODUCT_ASUS_RT2870_3) },
-    { USB_VP(USB_VENDOR_ASUS,          USB_PRODUCT_ASUS_RT2870_4) },
-    { USB_VP(USB_VENDOR_ASUS,          USB_PRODUCT_ASUS_RT2870_5) },
-    { USB_VP(USB_VENDOR_ASUS,          USB_PRODUCT_ASUS_USBN13) },
-    { USB_VP(USB_VENDOR_ASUS,          USB_PRODUCT_ASUS_RT3070_1) },
-    { USB_VP(USB_VENDOR_ASUS2,         USB_PRODUCT_ASUS2_USBN11) },
-    { USB_VP(USB_VENDOR_AZUREWAVE,     USB_PRODUCT_AZUREWAVE_RT2870_1) },
-    { USB_VP(USB_VENDOR_AZUREWAVE,     USB_PRODUCT_AZUREWAVE_RT2870_2) },
-    { USB_VP(USB_VENDOR_AZUREWAVE,     USB_PRODUCT_AZUREWAVE_RT3070_1) },
-    { USB_VP(USB_VENDOR_AZUREWAVE,     USB_PRODUCT_AZUREWAVE_RT3070_2) },
-    { USB_VP(USB_VENDOR_AZUREWAVE,     USB_PRODUCT_AZUREWAVE_RT3070_3) },
-    { USB_VP(USB_VENDOR_BELKIN,                USB_PRODUCT_BELKIN_F5D8053V3) },
-    { USB_VP(USB_VENDOR_BELKIN,                USB_PRODUCT_BELKIN_F5D8055) },
-    { USB_VP(USB_VENDOR_BELKIN,                USB_PRODUCT_BELKIN_F6D4050V1) },
-    { USB_VP(USB_VENDOR_BELKIN,                USB_PRODUCT_BELKIN_RT2870_1) },
-    { USB_VP(USB_VENDOR_BELKIN,                USB_PRODUCT_BELKIN_RT2870_2) },
-    { USB_VP(USB_VENDOR_CISCOLINKSYS2, USB_PRODUCT_CISCOLINKSYS2_RT3070) },
-    { USB_VP(USB_VENDOR_CISCOLINKSYS3, USB_PRODUCT_CISCOLINKSYS2_RT3070) },
-    { USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_1) },
-    { USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_2) },
-    { USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_3) },
-    { USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_4) },
-    { USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_5) },
-    { USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_6) },
-    { USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_7) },
-    { USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT2870_8) },
-    { USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT3070_1) },
-    { USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT3070_2) },
-    { USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_VIGORN61) },
-    { USB_VP(USB_VENDOR_COREGA,                
USB_PRODUCT_COREGA_CGWLUSB300GNM) },
-    { USB_VP(USB_VENDOR_COREGA,                USB_PRODUCT_COREGA_RT2870_1) },
-    { USB_VP(USB_VENDOR_COREGA,                USB_PRODUCT_COREGA_RT2870_2) },
-    { USB_VP(USB_VENDOR_COREGA,                USB_PRODUCT_COREGA_RT2870_3) },
-    { USB_VP(USB_VENDOR_COREGA,                USB_PRODUCT_COREGA_RT3070) },
-    { USB_VP(USB_VENDOR_CYBERTAN,      USB_PRODUCT_CYBERTAN_RT2870) },
-    { USB_VP(USB_VENDOR_DLINK,         USB_PRODUCT_DLINK_RT2870) },
-    { USB_VP(USB_VENDOR_DLINK,         USB_PRODUCT_DLINK_RT3072) },
-    { USB_VP(USB_VENDOR_DLINK2,                USB_PRODUCT_DLINK2_DWA130) },
-    { USB_VP(USB_VENDOR_DLINK2,                USB_PRODUCT_DLINK2_RT2870_1) },
-    { USB_VP(USB_VENDOR_DLINK2,                USB_PRODUCT_DLINK2_RT2870_2) },
-    { USB_VP(USB_VENDOR_DLINK2,                USB_PRODUCT_DLINK2_RT3070_1) },
-    { USB_VP(USB_VENDOR_DLINK2,                USB_PRODUCT_DLINK2_RT3070_2) },
-    { USB_VP(USB_VENDOR_DLINK2,                USB_PRODUCT_DLINK2_RT3070_3) },
-    { USB_VP(USB_VENDOR_DLINK2,                USB_PRODUCT_DLINK2_RT3070_4) },
-    { USB_VP(USB_VENDOR_DLINK2,                USB_PRODUCT_DLINK2_RT3070_5) },
-    { USB_VP(USB_VENDOR_DLINK2,                USB_PRODUCT_DLINK2_RT3072) },
-    { USB_VP(USB_VENDOR_DLINK2,                USB_PRODUCT_DLINK2_RT3072_1) },
-    { USB_VP(USB_VENDOR_EDIMAX,                USB_PRODUCT_EDIMAX_EW7717) },
-    { USB_VP(USB_VENDOR_EDIMAX,                USB_PRODUCT_EDIMAX_EW7718) },
-    { USB_VP(USB_VENDOR_EDIMAX,                USB_PRODUCT_EDIMAX_RT2870_1) },
-    { USB_VP(USB_VENDOR_ENCORE,                USB_PRODUCT_ENCORE_RT3070_1) },
-    { USB_VP(USB_VENDOR_ENCORE,                USB_PRODUCT_ENCORE_RT3070_2) },
-    { USB_VP(USB_VENDOR_ENCORE,                USB_PRODUCT_ENCORE_RT3070_3) },
-    { USB_VP(USB_VENDOR_GIGABYTE,      USB_PRODUCT_GIGABYTE_GNWB31N) },
-    { USB_VP(USB_VENDOR_GIGABYTE,      USB_PRODUCT_GIGABYTE_GNWB32L) },
-    { USB_VP(USB_VENDOR_GIGABYTE,      USB_PRODUCT_GIGABYTE_RT2870_1) },
-    { USB_VP(USB_VENDOR_GIGASET,       USB_PRODUCT_GIGASET_RT3070_1) },
-    { USB_VP(USB_VENDOR_GIGASET,       USB_PRODUCT_GIGASET_RT3070_2) },
-    { USB_VP(USB_VENDOR_GUILLEMOT,     USB_PRODUCT_GUILLEMOT_HWNU300) },
-    { USB_VP(USB_VENDOR_HAWKING,       USB_PRODUCT_HAWKING_HWUN2) },
-    { USB_VP(USB_VENDOR_HAWKING,       USB_PRODUCT_HAWKING_RT2870_1) },
-    { USB_VP(USB_VENDOR_HAWKING,       USB_PRODUCT_HAWKING_RT2870_2) },
-    { USB_VP(USB_VENDOR_HAWKING,       USB_PRODUCT_HAWKING_RT3070) },
-    { USB_VP(USB_VENDOR_IODATA,                USB_PRODUCT_IODATA_RT3072_1) },
-    { USB_VP(USB_VENDOR_IODATA,                USB_PRODUCT_IODATA_RT3072_2) },
-    { USB_VP(USB_VENDOR_IODATA,                USB_PRODUCT_IODATA_RT3072_3) },
-    { USB_VP(USB_VENDOR_IODATA,                USB_PRODUCT_IODATA_RT3072_4) },
-    { USB_VP(USB_VENDOR_LINKSYS4,      USB_PRODUCT_LINKSYS4_RT3070) },
-    { USB_VP(USB_VENDOR_LINKSYS4,      USB_PRODUCT_LINKSYS4_WUSB100) },
-    { USB_VP(USB_VENDOR_LINKSYS4,      USB_PRODUCT_LINKSYS4_WUSB54GCV3) },
-    { USB_VP(USB_VENDOR_LINKSYS4,      USB_PRODUCT_LINKSYS4_WUSB600N) },
-    { USB_VP(USB_VENDOR_LINKSYS4,      USB_PRODUCT_LINKSYS4_WUSB600NV2) },
-    { USB_VP(USB_VENDOR_LOGITEC,       USB_PRODUCT_LOGITEC_RT2870_1) },
-    { USB_VP(USB_VENDOR_LOGITEC,       USB_PRODUCT_LOGITEC_RT2870_2) },
-    { USB_VP(USB_VENDOR_LOGITEC,       USB_PRODUCT_LOGITEC_RT2870_3) },
-    { USB_VP(USB_VENDOR_MELCO,         USB_PRODUCT_MELCO_RT2870_1) },
-    { USB_VP(USB_VENDOR_MELCO,         USB_PRODUCT_MELCO_RT2870_2) },
-    { USB_VP(USB_VENDOR_MELCO,         USB_PRODUCT_MELCO_WLIUCAG300N) },
-    { USB_VP(USB_VENDOR_MELCO,         USB_PRODUCT_MELCO_WLIUCG300N) },
-    { USB_VP(USB_VENDOR_MELCO,         USB_PRODUCT_MELCO_WLIUCGN) },
-    { USB_VP(USB_VENDOR_MOTOROLA4,     USB_PRODUCT_MOTOROLA4_RT2770) },
-    { USB_VP(USB_VENDOR_MOTOROLA4,     USB_PRODUCT_MOTOROLA4_RT3070) },
-    { USB_VP(USB_VENDOR_MSI,           USB_PRODUCT_MSI_RT3070_1) },
-    { USB_VP(USB_VENDOR_MSI,           USB_PRODUCT_MSI_RT3070_2) },
-    { USB_VP(USB_VENDOR_MSI,           USB_PRODUCT_MSI_RT3070_3) },
-    { USB_VP(USB_VENDOR_MSI,           USB_PRODUCT_MSI_RT3070_4) },
-    { USB_VP(USB_VENDOR_MSI,           USB_PRODUCT_MSI_RT3070_5) },
-    { USB_VP(USB_VENDOR_MSI,           USB_PRODUCT_MSI_RT3070_6) },
-    { USB_VP(USB_VENDOR_MSI,           USB_PRODUCT_MSI_RT3070_7) },
-    { USB_VP(USB_VENDOR_MSI,           USB_PRODUCT_MSI_RT3070_8) },
-    { USB_VP(USB_VENDOR_MSI,           USB_PRODUCT_MSI_RT3070_9) },
-    { USB_VP(USB_VENDOR_MSI,           USB_PRODUCT_MSI_RT3070_10) },
-    { USB_VP(USB_VENDOR_MSI,           USB_PRODUCT_MSI_RT3070_11) },
-    { USB_VP(USB_VENDOR_OVISLINK,      USB_PRODUCT_OVISLINK_RT3072) },
-    { USB_VP(USB_VENDOR_PARA,          USB_PRODUCT_PARA_RT3070) },
-    { USB_VP(USB_VENDOR_PEGATRON,      USB_PRODUCT_PEGATRON_RT2870) },
-    { USB_VP(USB_VENDOR_PEGATRON,      USB_PRODUCT_PEGATRON_RT3070) },
-    { USB_VP(USB_VENDOR_PEGATRON,      USB_PRODUCT_PEGATRON_RT3070_2) },
-    { USB_VP(USB_VENDOR_PEGATRON,      USB_PRODUCT_PEGATRON_RT3070_3) },
-    { USB_VP(USB_VENDOR_PHILIPS,       USB_PRODUCT_PHILIPS_RT2870) },
-    { USB_VP(USB_VENDOR_PLANEX2,       USB_PRODUCT_PLANEX2_GWUS300MINIS) },
-    { USB_VP(USB_VENDOR_PLANEX2,       USB_PRODUCT_PLANEX2_GWUSMICRON) },
-    { USB_VP(USB_VENDOR_PLANEX2,       USB_PRODUCT_PLANEX2_RT2870) },
-    { USB_VP(USB_VENDOR_PLANEX2,       USB_PRODUCT_PLANEX2_RT3070) },
-    { USB_VP(USB_VENDOR_QCOM,          USB_PRODUCT_QCOM_RT2870) },
-    { USB_VP(USB_VENDOR_QUANTA,                USB_PRODUCT_QUANTA_RT3070) },
-    { USB_VP(USB_VENDOR_RALINK,                USB_PRODUCT_RALINK_RT2070) },
-    { USB_VP(USB_VENDOR_RALINK,                USB_PRODUCT_RALINK_RT2770) },
-    { USB_VP(USB_VENDOR_RALINK,                USB_PRODUCT_RALINK_RT2870) },
-    { USB_VP(USB_VENDOR_RALINK,                USB_PRODUCT_RALINK_RT3070) },
-    { USB_VP(USB_VENDOR_RALINK,                USB_PRODUCT_RALINK_RT3071) },
-    { USB_VP(USB_VENDOR_RALINK,                USB_PRODUCT_RALINK_RT3072) },
-    { USB_VP(USB_VENDOR_RALINK,                USB_PRODUCT_RALINK_RT3370) },
-    { USB_VP(USB_VENDOR_RALINK,                USB_PRODUCT_RALINK_RT3572) },
-    { USB_VP(USB_VENDOR_RALINK,                USB_PRODUCT_RALINK_RT8070) },
-    { USB_VP(USB_VENDOR_SAMSUNG2,      USB_PRODUCT_SAMSUNG2_RT2870_1) },
-    { USB_VP(USB_VENDOR_SENAO,         USB_PRODUCT_SENAO_RT2870_1) },
-    { USB_VP(USB_VENDOR_SENAO,         USB_PRODUCT_SENAO_RT2870_2) },
-    { USB_VP(USB_VENDOR_SENAO,         USB_PRODUCT_SENAO_RT2870_3) },
-    { USB_VP(USB_VENDOR_SENAO,         USB_PRODUCT_SENAO_RT2870_4) },
-    { USB_VP(USB_VENDOR_SENAO,         USB_PRODUCT_SENAO_RT3070) },
-    { USB_VP(USB_VENDOR_SENAO,         USB_PRODUCT_SENAO_RT3071) },
-    { USB_VP(USB_VENDOR_SENAO,         USB_PRODUCT_SENAO_RT3072_1) },
-    { USB_VP(USB_VENDOR_SENAO,         USB_PRODUCT_SENAO_RT3072_2) },
-    { USB_VP(USB_VENDOR_SENAO,         USB_PRODUCT_SENAO_RT3072_3) },
-    { USB_VP(USB_VENDOR_SENAO,         USB_PRODUCT_SENAO_RT3072_4) },
-    { USB_VP(USB_VENDOR_SENAO,         USB_PRODUCT_SENAO_RT3072_5) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_RT2770) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_RT2870_1) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_RT2870_2) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_RT2870_3) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_RT2870_4) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_RT3070) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_RT3070_2) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_RT3070_3) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_RT3070_4) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_RT3071) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_RT3072_1) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_RT3072_2) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_RT3072_3) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_RT3072_4) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_RT3072_5) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_RT3072_6) },
-    { USB_VP(USB_VENDOR_SITECOMEU,     USB_PRODUCT_SITECOMEU_WL608) },
-    { USB_VP(USB_VENDOR_SPARKLAN,      USB_PRODUCT_SPARKLAN_RT2870_1) },
-    { USB_VP(USB_VENDOR_SPARKLAN,      USB_PRODUCT_SPARKLAN_RT3070) },
-    { USB_VP(USB_VENDOR_SWEEX2,                USB_PRODUCT_SWEEX2_LW153) },
-    { USB_VP(USB_VENDOR_SWEEX2,                USB_PRODUCT_SWEEX2_LW303) },
-    { USB_VP(USB_VENDOR_SWEEX2,                USB_PRODUCT_SWEEX2_LW313) },
-    { USB_VP(USB_VENDOR_TOSHIBA,       USB_PRODUCT_TOSHIBA_RT3070) },
-    { USB_VP(USB_VENDOR_UMEDIA,                USB_PRODUCT_UMEDIA_RT2870_1) },
-    { USB_VP(USB_VENDOR_ZCOM,          USB_PRODUCT_ZCOM_RT2870_1) },
-    { USB_VP(USB_VENDOR_ZCOM,          USB_PRODUCT_ZCOM_RT2870_2) },
-    { USB_VP(USB_VENDOR_ZINWELL,       USB_PRODUCT_ZINWELL_RT2870_1) },
-    { USB_VP(USB_VENDOR_ZINWELL,       USB_PRODUCT_ZINWELL_RT2870_2) },
-    { USB_VP(USB_VENDOR_ZINWELL,       USB_PRODUCT_ZINWELL_RT3070) },
-    { USB_VP(USB_VENDOR_ZINWELL,       USB_PRODUCT_ZINWELL_RT3072_1) },
-    { USB_VP(USB_VENDOR_ZINWELL,       USB_PRODUCT_ZINWELL_RT3072_2) },
-    { USB_VP(USB_VENDOR_ZYXEL,         USB_PRODUCT_ZYXEL_RT2870_1) },
-    { USB_VP(USB_VENDOR_ZYXEL,         USB_PRODUCT_ZYXEL_RT2870_2) },
+#define RUN_DEV(v,p) { USB_VP(USB_VENDOR_##v, USB_PRODUCT_##v##_##p) }
+    RUN_DEV(ABOCOM,            RT2770),
+    RUN_DEV(ABOCOM,            RT2870),
+    RUN_DEV(ABOCOM,            RT3070),
+    RUN_DEV(ABOCOM,            RT3071),
+    RUN_DEV(ABOCOM,            RT3072),
+    RUN_DEV(ABOCOM2,           RT2870_1),
+    RUN_DEV(ACCTON,            RT2770),
+    RUN_DEV(ACCTON,            RT2870_1),
+    RUN_DEV(ACCTON,            RT2870_2),
+    RUN_DEV(ACCTON,            RT2870_3),
+    RUN_DEV(ACCTON,            RT2870_4),
+    RUN_DEV(ACCTON,            RT2870_5),
+    RUN_DEV(ACCTON,            RT3070),
+    RUN_DEV(ACCTON,            RT3070_1),
+    RUN_DEV(ACCTON,            RT3070_2),
+    RUN_DEV(ACCTON,            RT3070_3),
+    RUN_DEV(ACCTON,            RT3070_4),
+    RUN_DEV(ACCTON,            RT3070_5),
+    RUN_DEV(AIRTIES,           RT3070),
+    RUN_DEV(ALLWIN,            RT2070),
+    RUN_DEV(ALLWIN,            RT2770),
+    RUN_DEV(ALLWIN,            RT2870),
+    RUN_DEV(ALLWIN,            RT3070),
+    RUN_DEV(ALLWIN,            RT3071),
+    RUN_DEV(ALLWIN,            RT3072),
+    RUN_DEV(ALLWIN,            RT3572),
+    RUN_DEV(AMIGO,             RT2870_1),
+    RUN_DEV(AMIGO,             RT2870_2),
+    RUN_DEV(AMIT,              CGWLUSB2GNR),
+    RUN_DEV(AMIT,              RT2870_1),
+    RUN_DEV(AMIT2,             RT2870),
+    RUN_DEV(ASUS,              RT2870_1),
+    RUN_DEV(ASUS,              RT2870_2),
+    RUN_DEV(ASUS,              RT2870_3),
+    RUN_DEV(ASUS,              RT2870_4),
+    RUN_DEV(ASUS,              RT2870_5),
+    RUN_DEV(ASUS,              USBN13),
+    RUN_DEV(ASUS,              RT3070_1),
+    RUN_DEV(ASUS2,             USBN11),
+    RUN_DEV(AZUREWAVE,         RT2870_1),
+    RUN_DEV(AZUREWAVE,         RT2870_2),
+    RUN_DEV(AZUREWAVE,         RT3070_1),
+    RUN_DEV(AZUREWAVE,         RT3070_2),
+    RUN_DEV(AZUREWAVE,         RT3070_3),
+    RUN_DEV(BELKIN,            F5D8053V3),
+    RUN_DEV(BELKIN,            F5D8055),
+    RUN_DEV(BELKIN,            F6D4050V1),
+    RUN_DEV(BELKIN,            RT2870_1),
+    RUN_DEV(BELKIN,            RT2870_2),
+    RUN_DEV(CISCOLINKSYS2,     RT3070),
+    RUN_DEV(CISCOLINKSYS3,     RT3070),
+    RUN_DEV(CONCEPTRONIC2,     RT2870_1),
+    RUN_DEV(CONCEPTRONIC2,     RT2870_2),
+    RUN_DEV(CONCEPTRONIC2,     RT2870_3),
+    RUN_DEV(CONCEPTRONIC2,     RT2870_4),
+    RUN_DEV(CONCEPTRONIC2,     RT2870_5),
+    RUN_DEV(CONCEPTRONIC2,     RT2870_6),
+    RUN_DEV(CONCEPTRONIC2,     RT2870_7),
+    RUN_DEV(CONCEPTRONIC2,     RT2870_8),
+    RUN_DEV(CONCEPTRONIC2,     RT3070_1),
+    RUN_DEV(CONCEPTRONIC2,     RT3070_2),
+    RUN_DEV(CONCEPTRONIC2,     VIGORN61),
+    RUN_DEV(COREGA,            CGWLUSB300GNM),
+    RUN_DEV(COREGA,            RT2870_1),
+    RUN_DEV(COREGA,            RT2870_2),
+    RUN_DEV(COREGA,            RT2870_3),
+    RUN_DEV(COREGA,            RT3070),
+    RUN_DEV(CYBERTAN,          RT2870),
+    RUN_DEV(DLINK,             RT2870),
+    RUN_DEV(DLINK,             RT3072),
+    RUN_DEV(DLINK2,            DWA130),
+    RUN_DEV(DLINK2,            RT2870_1),
+    RUN_DEV(DLINK2,            RT2870_2),
+    RUN_DEV(DLINK2,            RT3070_1),
+    RUN_DEV(DLINK2,            RT3070_2),
+    RUN_DEV(DLINK2,            RT3070_3),
+    RUN_DEV(DLINK2,            RT3070_4),
+    RUN_DEV(DLINK2,            RT3070_5),
+    RUN_DEV(DLINK2,            RT3072),
+    RUN_DEV(DLINK2,            RT3072_1),
+    RUN_DEV(EDIMAX,            EW7717),
+    RUN_DEV(EDIMAX,            EW7718),
+    RUN_DEV(EDIMAX,            RT2870_1),
+    RUN_DEV(ENCORE,            RT3070_1),
+    RUN_DEV(ENCORE,            RT3070_2),
+    RUN_DEV(ENCORE,            RT3070_3),
+    RUN_DEV(GIGABYTE,          GNWB31N),
+    RUN_DEV(GIGABYTE,          GNWB32L),
+    RUN_DEV(GIGABYTE,          RT2870_1),
+    RUN_DEV(GIGASET,           RT3070_1),
+    RUN_DEV(GIGASET,           RT3070_2),
+    RUN_DEV(GUILLEMOT,         HWNU300),
+    RUN_DEV(HAWKING,           HWUN2),
+    RUN_DEV(HAWKING,           RT2870_1),
+    RUN_DEV(HAWKING,           RT2870_2),
+    RUN_DEV(HAWKING,           RT3070),
+    RUN_DEV(IODATA,            RT3072_1),
+    RUN_DEV(IODATA,            RT3072_2),
+    RUN_DEV(IODATA,            RT3072_3),
+    RUN_DEV(IODATA,            RT3072_4),
+    RUN_DEV(LINKSYS4,          RT3070),
+    RUN_DEV(LINKSYS4,          WUSB100),
+    RUN_DEV(LINKSYS4,          WUSB54GCV3),
+    RUN_DEV(LINKSYS4,          WUSB600N),
+    RUN_DEV(LINKSYS4,          WUSB600NV2),
+    RUN_DEV(LOGITEC,           RT2870_1),
+    RUN_DEV(LOGITEC,           RT2870_2),
+    RUN_DEV(LOGITEC,           RT2870_3),
+    RUN_DEV(MELCO,             RT2870_1),
+    RUN_DEV(MELCO,             RT2870_2),
+    RUN_DEV(MELCO,             WLIUCAG300N),
+    RUN_DEV(MELCO,             WLIUCG300N),
+    RUN_DEV(MELCO,             WLIUCGN),
+    RUN_DEV(MOTOROLA4,         RT2770),
+    RUN_DEV(MOTOROLA4,         RT3070),
+    RUN_DEV(MSI,               RT3070_1),
+    RUN_DEV(MSI,               RT3070_2),
+    RUN_DEV(MSI,               RT3070_3),
+    RUN_DEV(MSI,               RT3070_4),
+    RUN_DEV(MSI,               RT3070_5),
+    RUN_DEV(MSI,               RT3070_6),
+    RUN_DEV(MSI,               RT3070_7),
+    RUN_DEV(MSI,               RT3070_8),
+    RUN_DEV(MSI,               RT3070_9),
+    RUN_DEV(MSI,               RT3070_10),
+    RUN_DEV(MSI,               RT3070_11),
+    RUN_DEV(OVISLINK,          RT3072),
+    RUN_DEV(PARA,              RT3070),
+    RUN_DEV(PEGATRON,          RT2870),
+    RUN_DEV(PEGATRON,          RT3070),
+    RUN_DEV(PEGATRON,          RT3070_2),
+    RUN_DEV(PEGATRON,          RT3070_3),
+    RUN_DEV(PHILIPS,           RT2870),
+    RUN_DEV(PLANEX2,           GWUS300MINIS),
+    RUN_DEV(PLANEX2,           GWUSMICRON),
+    RUN_DEV(PLANEX2,           RT2870),
+    RUN_DEV(PLANEX2,           RT3070),
+    RUN_DEV(QCOM,              RT2870),
+    RUN_DEV(QUANTA,            RT3070),
+    RUN_DEV(RALINK,            RT2070),
+    RUN_DEV(RALINK,            RT2770),
+    RUN_DEV(RALINK,            RT2870),
+    RUN_DEV(RALINK,            RT3070),
+    RUN_DEV(RALINK,            RT3071),
+    RUN_DEV(RALINK,            RT3072),
+    RUN_DEV(RALINK,            RT3370),
+    RUN_DEV(RALINK,            RT3572),
+    RUN_DEV(RALINK,            RT8070),
+    RUN_DEV(SAMSUNG2,          RT2870_1),
+    RUN_DEV(SENAO,             RT2870_1),
+    RUN_DEV(SENAO,             RT2870_2),
+    RUN_DEV(SENAO,             RT2870_3),
+    RUN_DEV(SENAO,             RT2870_4),
+    RUN_DEV(SENAO,             RT3070),
+    RUN_DEV(SENAO,             RT3071),
+    RUN_DEV(SENAO,             RT3072_1),
+    RUN_DEV(SENAO,             RT3072_2),
+    RUN_DEV(SENAO,             RT3072_3),
+    RUN_DEV(SENAO,             RT3072_4),
+    RUN_DEV(SENAO,             RT3072_5),
+    RUN_DEV(SITECOMEU,         RT2770),
+    RUN_DEV(SITECOMEU,         RT2870_1),
+    RUN_DEV(SITECOMEU,         RT2870_2),
+    RUN_DEV(SITECOMEU,         RT2870_3),
+    RUN_DEV(SITECOMEU,         RT2870_4),
+    RUN_DEV(SITECOMEU,         RT3070),
+    RUN_DEV(SITECOMEU,         RT3070_2),
+    RUN_DEV(SITECOMEU,         RT3070_3),
+    RUN_DEV(SITECOMEU,         RT3070_4),
+    RUN_DEV(SITECOMEU,         RT3071),
+    RUN_DEV(SITECOMEU,         RT3072_1),
+    RUN_DEV(SITECOMEU,         RT3072_2),
+    RUN_DEV(SITECOMEU,         RT3072_3),
+    RUN_DEV(SITECOMEU,         RT3072_4),
+    RUN_DEV(SITECOMEU,         RT3072_5),
+    RUN_DEV(SITECOMEU,         RT3072_6),
+    RUN_DEV(SITECOMEU,         WL608),
+    RUN_DEV(SPARKLAN,          RT2870_1),
+    RUN_DEV(SPARKLAN,          RT3070),
+    RUN_DEV(SWEEX2,            LW153),
+    RUN_DEV(SWEEX2,            LW303),
+    RUN_DEV(SWEEX2,            LW313),
+    RUN_DEV(TOSHIBA,           RT3070),
+    RUN_DEV(UMEDIA,            RT2870_1),
+    RUN_DEV(ZCOM,              RT2870_1),
+    RUN_DEV(ZCOM,              RT2870_2),
+    RUN_DEV(ZINWELL,           RT2870_1),
+    RUN_DEV(ZINWELL,           RT2870_2),
+    RUN_DEV(ZINWELL,           RT3070),
+    RUN_DEV(ZINWELL,           RT3072_1),
+    RUN_DEV(ZINWELL,           RT3072_2),
+    RUN_DEV(ZYXEL,             RT2870_1),
+    RUN_DEV(ZYXEL,             RT2870_2),
+#undef RUN_DEV
 };
 
 MODULE_DEPEND(run, wlan, 1, 1, 1);
@@ -1920,7 +1922,7 @@ run_wme_update(struct ieee80211com *ic)
                sc->cmdq[i].func = run_wme_update_cb;
                sc->cmdq[i].arg0 = ic;
                ieee80211_runtask(ic, &sc->cmdq_task);
-               return 0;
+               return (0);
        }
 
        RUN_LOCK(sc);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to