From b485fb175fb3140522f5a71e41e8a66bd6511acf Mon Sep 17 00:00:00 2001 From: Bill Paul Date: Tue, 21 Mar 2000 15:20:41 +0000 Subject: [PATCH] Regenerate usbdevs files. Also add device entry in if_kue.c for the LINKSYS USB10T adapter. Also add calls to bpfdetach() in detach routines. --- sys/dev/usb/if_aue.c | 1 + sys/dev/usb/if_cue.c | 1 + sys/dev/usb/if_kue.c | 5 ++++- sys/dev/usb/usbdevs.h | 3 ++- sys/dev/usb/usbdevs_data.h | 8 +++++++- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index c3ed9e7bce5..fe0e9f5aca9 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -754,6 +754,7 @@ static int aue_detach(dev) sc->aue_gone = 1; untimeout(aue_tick, sc, sc->aue_stat_ch); + bpfdetach(ifp); if_detach(ifp); if (sc->aue_ep[AUE_ENDPT_TX] != NULL) diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index 55d28e60e04..4dc5392c1ee 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -581,6 +581,7 @@ static int cue_detach(dev) sc->cue_gone = 1; untimeout(cue_tick, sc, sc->cue_stat_ch); + bpfdetach(ifp); if_detach(ifp); if (sc->cue_ep[CUE_ENDPT_TX] != NULL) diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index 10419287d57..341299107eb 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -114,6 +114,7 @@ static struct kue_type kue_devs[] = { { USB_VENDOR_COREGA, USB_PRODUCT_COREGA_ETHER_USB_T }, { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C }, { USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB }, + { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T }, { 0, 0 } }; @@ -523,8 +524,10 @@ static int kue_detach(dev) sc->kue_gone = 1; - if (ifp != NULL) + if (ifp != NULL) { + bpfdetach(ifp); if_detach(ifp); + } if (sc->kue_ep[KUE_ENDPT_TX] != NULL) usbd_abort_pipe(sc->kue_ep[KUE_ENDPT_TX]); diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index f720a985579..66d0f07c13b 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -4,7 +4,7 @@ * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.14 2000/03/20 19:49:20 gehenna Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.15 2000/03/21 15:18:51 wpaul Exp */ /* @@ -399,6 +399,7 @@ #define USB_PRODUCT_LEXMARK_S2450 0x0009 /* Optra S 2450 */ /* Linksys products */ +#define USB_PRODUCT_LINKSYS_USB10T 0x2202 /* USB10T Ethernet */ #define USB_PRODUCT_LINKSYS_USB100TX 0x2203 /* USB100TX Ethernet */ /* Logitech products */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 975214f74be..bd8a74b5e7c 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -4,7 +4,7 @@ * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.14 2000/03/20 19:49:20 gehenna Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.15 2000/03/21 15:18:51 wpaul Exp */ /* @@ -501,6 +501,12 @@ struct usb_knowndev usb_knowndevs[] = { "Lexmark International Inc.", "Optra S 2450", }, + { + USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T, + 0, + "Linksys Inc.", + "USB10T Ethernet", + }, { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX, 0,