From owner-svn-src-all@freebsd.org Thu Sep 17 03:08:03 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 412189CDD27; Thu, 17 Sep 2015 03:08:03 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2E4861D6A; Thu, 17 Sep 2015 03:08:03 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8H383Zx044953; Thu, 17 Sep 2015 03:08:03 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8H382AD044951; Thu, 17 Sep 2015 03:08:02 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201509170308.t8H382AD044951@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Thu, 17 Sep 2015 03:08:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287894 - head/sys/dev/usb/wlan X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Sep 2015 03:08:03 -0000 Author: adrian Date: Thu Sep 17 03:08:02 2015 New Revision: 287894 URL: https://svnweb.freebsd.org/changeset/base/287894 Log: Prepare for 11n - get the number of endpoints and whether 11n is available. Modified: head/sys/dev/usb/wlan/if_rsu.c head/sys/dev/usb/wlan/if_rsureg.h Modified: head/sys/dev/usb/wlan/if_rsu.c ============================================================================== --- head/sys/dev/usb/wlan/if_rsu.c Thu Sep 17 03:01:55 2015 (r287893) +++ head/sys/dev/usb/wlan/if_rsu.c Thu Sep 17 03:08:02 2015 (r287894) @@ -313,10 +313,16 @@ rsu_attach(device_t self) struct ieee80211com *ic = &sc->sc_ic; int error; uint8_t iface_index, bands; + struct usb_interface *iface; device_set_usb_desc(self); sc->sc_udev = uaa->device; sc->sc_dev = self; + sc->sc_ht = !! (USB_GET_DRIVER_INFO(uaa) & RSU_HT_SUPPORTED); + + /* Get number of endpoints */ + iface = usbd_get_iface(sc->sc_udev, 0); + sc->sc_nendpoints = iface->idesc->bNumEndpoints; mtx_init(&sc->sc_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK, MTX_DEF); Modified: head/sys/dev/usb/wlan/if_rsureg.h ============================================================================== --- head/sys/dev/usb/wlan/if_rsureg.h Thu Sep 17 03:01:55 2015 (r287893) +++ head/sys/dev/usb/wlan/if_rsureg.h Thu Sep 17 03:08:02 2015 (r287894) @@ -736,6 +736,8 @@ struct rsu_softc { struct timeout_task calib_task; const uint8_t *qid2idx; struct mtx sc_mtx; + int sc_ht; + int sc_nendpoints; u_int sc_running:1, sc_calibrating:1,