summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authorgavin <gavin@FreeBSD.org>2011-06-26 11:37:24 +0000
committergavin <gavin@FreeBSD.org>2011-06-26 11:37:24 +0000
commit1d169284e3cab5f4a13ee56c30c1d21f166855c2 (patch)
tree9ed13a374566258bc3c872da2af989ca748abd5a /sys/dev
parent1c5a60f771db5ca54fa7e1946d4240e7fa0c1f89 (diff)
downloadFreeBSD-src-1d169284e3cab5f4a13ee56c30c1d21f166855c2.zip
FreeBSD-src-1d169284e3cab5f4a13ee56c30c1d21f166855c2.tar.gz
The SMCWUSBG is a zyd(4) device, not an uath(4) device. Remove from the
latter. It appears that the addition to uath(4) came in through PR kern/135009, which had tested another device, the SMCWUSBTG2, successfully with uath(4) and included the SMCWUSBG as it "has the same chipset". I can find no other evidence that these two do actually share the same chipset. Moreover, Linux treats the SMCWUSBG as a zyd(4) device also. This reverts r223537. Discussed with: hselasky, kevlo MFC after: 1 week
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/wlan/if_uath.c1
-rw-r--r--sys/dev/usb/wlan/if_zyd.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c
index baff5de..328dc4f 100644
--- a/sys/dev/usb/wlan/if_uath.c
+++ b/sys/dev/usb/wlan/if_uath.c
@@ -169,7 +169,6 @@ enum {
/* recognized device vendors/products */
static const STRUCT_USB_HOST_ID uath_devs[] = {
#define UATH_DEV(v,p) { USB_VP(USB_VENDOR_##v, USB_PRODUCT_##v##_##p) }
- UATH_DEV(ACCTON, SMCWUSBG),
UATH_DEV(ACCTON, SMCWUSBTG2),
UATH_DEV(ATHEROS, AR5523),
UATH_DEV(ATHEROS2, AR5523_1),
diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c
index 4221c34..f8d905e 100644
--- a/sys/dev/usb/wlan/if_zyd.c
+++ b/sys/dev/usb/wlan/if_zyd.c
@@ -229,6 +229,7 @@ static const STRUCT_USB_HOST_ID zyd_devs[] = {
ZYD_ZD1211_DEV(ZYXEL, ZYAIRG220),
ZYD_ZD1211_DEV(ZYXEL, G200V2),
/* ZYD_ZD1211B */
+ ZYD_ZD1211B_DEV(ACCTON, SMCWUSBG_NF),
ZYD_ZD1211B_DEV(ACCTON, SMCWUSBG),
ZYD_ZD1211B_DEV(ACCTON, ZD1211B),
ZYD_ZD1211B_DEV(ASUS, A9T_WIFI),
OpenPOWER on IntegriCloud