Date: Sat, 7 Dec 2013 08:25:24 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r259063 - head/sys/dev/iwn Message-ID: <201312070825.rB78POiw063278@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Sat Dec 7 08:25:24 2013 New Revision: 259063 URL: http://svnweb.freebsd.org/changeset/base/259063 Log: Add a channel parameter to iwn_scan(). This is in preparation for being able to use iwn_scan() to do an off channel scan to reset the RF tuning. It should be a no-op. Tested: * Intel 5100 (STA) Modified: head/sys/dev/iwn/if_iwn.c Modified: head/sys/dev/iwn/if_iwn.c ============================================================================== --- head/sys/dev/iwn/if_iwn.c Sat Dec 7 08:20:24 2013 (r259062) +++ head/sys/dev/iwn/if_iwn.c Sat Dec 7 08:25:24 2013 (r259063) @@ -282,7 +282,7 @@ static int iwn_send_advanced_btcoex(stru static int iwn5000_runtime_calib(struct iwn_softc *); static int iwn_config(struct iwn_softc *); static uint8_t *ieee80211_add_ssid(uint8_t *, const uint8_t *, u_int); -static int iwn_scan(struct iwn_softc *); +static int iwn_scan(struct iwn_softc *, struct ieee80211_channel *); static int iwn_auth(struct iwn_softc *, struct ieee80211vap *vap); static int iwn_run(struct iwn_softc *, struct ieee80211vap *vap); static int iwn_ampdu_rx_start(struct ieee80211_node *, @@ -6352,7 +6352,7 @@ iwn_get_passive_dwell_time(struct iwn_so } static int -iwn_scan(struct iwn_softc *sc) +iwn_scan(struct iwn_softc *sc, struct ieee80211_channel *c) { struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; @@ -6364,7 +6364,6 @@ iwn_scan(struct iwn_softc *sc) struct iwn_scan_chan *chan; struct ieee80211_frame *wh; struct ieee80211_rateset *rs; - struct ieee80211_channel *c; uint8_t *buf, *frm; uint16_t rxchain; uint8_t txant; @@ -8485,10 +8484,11 @@ iwn_scan_curchan(struct ieee80211_scan_s { struct ieee80211vap *vap = ss->ss_vap; struct iwn_softc *sc = vap->iv_ic->ic_ifp->if_softc; + struct ieee80211com *ic = vap->iv_ic; int error; IWN_LOCK(sc); - error = iwn_scan(sc); + error = iwn_scan(sc, ic->ic_curchan); IWN_UNLOCK(sc); if (error != 0) ieee80211_cancel_scan(vap);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312070825.rB78POiw063278>