From owner-svn-src-all@FreeBSD.ORG Mon Jun 14 08:24:00 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CB401065672; Mon, 14 Jun 2010 08:24:00 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 824FA8FC0A; Mon, 14 Jun 2010 08:24:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5E8O0Cc094332; Mon, 14 Jun 2010 08:24:00 GMT (envelope-from bschmidt@svn.freebsd.org) Received: (from bschmidt@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5E8O0s5094330; Mon, 14 Jun 2010 08:24:00 GMT (envelope-from bschmidt@svn.freebsd.org) Message-Id: <201006140824.o5E8O0s5094330@svn.freebsd.org> From: Bernhard Schmidt Date: Mon, 14 Jun 2010 08:24:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r209156 - head/sys/dev/ath X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 14 Jun 2010 08:24:00 -0000 Author: bschmidt Date: Mon Jun 14 08:24:00 2010 New Revision: 209156 URL: http://svn.freebsd.org/changeset/base/209156 Log: sc_lastrs is also used in case the sending station is not known, for example in a split IBSS scenario. Therefore always assign sc_lastrs. This removes a hack I committed in r206457. Approved by: rpaulo (mentor) Modified: head/sys/dev/ath/if_ath.c Modified: head/sys/dev/ath/if_ath.c ============================================================================== --- head/sys/dev/ath/if_ath.c Mon Jun 14 07:38:53 2010 (r209155) +++ head/sys/dev/ath/if_ath.c Mon Jun 14 08:24:00 2010 (r209156) @@ -3654,14 +3654,8 @@ ath_recv_mgmt(struct ieee80211_node *ni, case IEEE80211_FC0_SUBTYPE_PROBE_RESP: if (vap->iv_opmode == IEEE80211_M_IBSS && vap->iv_state == IEEE80211_S_RUN) { - uint32_t rstamp; - uint64_t tsf; - - if (sc->sc_lastrs == NULL) - break; - - rstamp = sc->sc_lastrs->rs_tstamp; - tsf = ath_extend_tsf(rstamp, + uint32_t rstamp = sc->sc_lastrs->rs_tstamp; + uint64_t tsf = ath_extend_tsf(rstamp, ath_hal_gettsf64(sc->sc_ah)); /* * Handle ibss merge as needed; check the tsf on the @@ -4002,11 +3996,11 @@ rx_accept: mtod(m, const struct ieee80211_frame_min *), rs->rs_keyix == HAL_RXKEYIX_INVALID ? IEEE80211_KEYIX_NONE : rs->rs_keyix); + sc->sc_lastrs = rs; if (ni != NULL) { /* * Sending station is known, dispatch directly. */ - sc->sc_lastrs = rs; type = ieee80211_input(ni, m, rs->rs_rssi, nf); ieee80211_free_node(ni); /*