diff options
author | damien <damien@FreeBSD.org> | 2005-07-03 15:38:41 +0000 |
---|---|---|
committer | damien <damien@FreeBSD.org> | 2005-07-03 15:38:41 +0000 |
commit | 0f0e5d42a8365f5188a3a11ef1046863d83bda0c (patch) | |
tree | b062976ab139ac015fb7014434674f53bd736fff | |
parent | 7542bb5c0fbd505557a7821479a4d1f00aeb6f41 (diff) | |
download | FreeBSD-src-0f0e5d42a8365f5188a3a11ef1046863d83bda0c.zip FreeBSD-src-0f0e5d42a8365f5188a3a11ef1046863d83bda0c.tar.gz |
o Add new ids for the Belkin F5D7050
o Indent usb ids properly
o Check the return value of if_alloc()
o Call if_free() in ural_detach()
Reviewed by: silby (mentor)
Approved by: re (scottl)
-rw-r--r-- | sys/dev/usb/if_ural.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sys/dev/usb/if_ural.c b/sys/dev/usb/if_ural.c index ea8f6ba..5589222 100644 --- a/sys/dev/usb/if_ural.c +++ b/sys/dev/usb/if_ural.c @@ -83,10 +83,11 @@ SYSCTL_INT(_hw_usb_ural, OID_AUTO, debug, CTLFLAG_RW, &uraldebug, 0, static const struct usb_devno ural_devs[] = { { USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL167G }, { USB_VENDOR_ASUS, USB_PRODUCT_RALINK_RT2570 }, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050 }, { USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_C54U }, { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWLG122 }, - { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54G }, - { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54GP }, + { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54G }, + { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54GP }, { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54 }, { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570 }, { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_2 }, @@ -408,8 +409,13 @@ USB_ATTACH(ural) printf("%s: MAC/BBP RT2570 (rev 0x%02x), RF %s\n", USBDEVNAME(sc->sc_dev), sc->asic_rev, ural_get_rf(sc->rf_rev)); - + ifp = sc->sc_ifp = if_alloc(IFT_ETHER); + if (ifp == NULL) { + printf("%s: can not if_alloc()\n", USBDEVNAME(sc->sc_dev)); + USB_ATTACH_ERROR_RETURN; + } + ifp->if_softc = sc; if_initname(ifp, "ural", USBDEVUNIT(sc->sc_dev)); ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST | @@ -517,6 +523,7 @@ USB_DETACH(ural) bpfdetach(ifp); ieee80211_ifdetach(ic); + if_free(ifp); mtx_destroy(&sc->sc_mtx); |