d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The SMCWUSBG is a zyd(4) device, not an uath(4) device. Remove from the

Browse Source 
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
This commit is contained in:
gavin 2011-06-26 11:37:24 +00:00
parent 1c5a60f771
commit 1d169284e3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/devd/uath.conf
View File

@ -3,13 +3,13 @@
# Atheros USB wireless network device specific devd events
# Accton
# SMCWUSB-G and SMCWUSBT-G2
# SMCWUSBT-G2
notify 100 {
match "system" "USB";
match "subsystem" "DEVICE";
match "type" "ATTACH";
match "vendor" "0x083a";
match "product" "(0x4505|0x4507)";
match "product" "0x4507";
action "/usr/sbin/uathload -d /dev/$cdev";
};

1
sys/dev/usb/wlan/if_uath.c
View File

@ -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),

1
sys/dev/usb/wlan/if_zyd.c
View File

@ -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),