From owner-svn-src-head@freebsd.org Sat Oct 3 20:44:17 2015 Return-Path: Delivered-To: svn-src-head@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 76E9AA0E060; Sat, 3 Oct 2015 20:44:17 +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 4DE5A1639; Sat, 3 Oct 2015 20:44:17 +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 t93KiHgr005975; Sat, 3 Oct 2015 20:44:17 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t93KiHHX005974; Sat, 3 Oct 2015 20:44:17 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201510032044.t93KiHHX005974@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sat, 3 Oct 2015 20:44:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r288631 - 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-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Oct 2015 20:44:17 -0000 Author: adrian Date: Sat Oct 3 20:44:16 2015 New Revision: 288631 URL: https://svnweb.freebsd.org/changeset/base/288631 Log: rum(4): attach rum_update_slot to ic_updateslot. Submitted by: Differential Revision: https://reviews.freebsd.org/D3631 Modified: head/sys/dev/usb/wlan/if_rum.c Modified: head/sys/dev/usb/wlan/if_rum.c ============================================================================== --- head/sys/dev/usb/wlan/if_rum.c Sat Oct 3 20:24:23 2015 (r288630) +++ head/sys/dev/usb/wlan/if_rum.c Sat Oct 3 20:44:16 2015 (r288631) @@ -207,7 +207,9 @@ static int rum_enable_tsf_sync(struct r static void rum_enable_tsf(struct rum_softc *); static void rum_abort_tsf_sync(struct rum_softc *); static void rum_get_tsf(struct rum_softc *, uint64_t *); -static void rum_update_slot(struct rum_softc *); +static void rum_update_slot_cb(struct rum_softc *, + union sec_param *, uint8_t, uint8_t); +static void rum_update_slot(struct ieee80211com *); static void rum_set_bssid(struct rum_softc *, const uint8_t *); static void rum_set_macaddr(struct rum_softc *, const uint8_t *); static void rum_update_mcast(struct ieee80211com *); @@ -516,6 +518,7 @@ rum_attach(device_t self) ic->ic_parent = rum_parent; ic->ic_vap_create = rum_vap_create; ic->ic_vap_delete = rum_vap_delete; + ic->ic_updateslot = rum_update_slot; ic->ic_update_mcast = rum_update_mcast; ieee80211_radiotap_attach(ic, @@ -785,7 +788,7 @@ rum_newstate(struct ieee80211vap *vap, e ret = EINVAL; goto run_fail; } - rum_update_slot(sc); + rum_update_slot_cb(sc, NULL, 0, 0); rum_enable_mrr(sc); rum_set_txpreamble(sc); rum_set_basicrates(sc); @@ -1862,7 +1865,8 @@ rum_get_tsf(struct rum_softc *sc, uint64 } static void -rum_update_slot(struct rum_softc *sc) +rum_update_slot_cb(struct rum_softc *sc, union sec_param *data, uint8_t rv_id, + uint8_t rvp_id) { struct ieee80211com *ic = &sc->sc_ic; uint8_t slottime; @@ -1875,6 +1879,12 @@ rum_update_slot(struct rum_softc *sc) } static void +rum_update_slot(struct ieee80211com *ic) +{ + rum_cmd_sleepable(ic->ic_softc, NULL, 0, 0, 0, rum_update_slot_cb); +} + +static void rum_set_bssid(struct rum_softc *sc, const uint8_t *bssid) {