From owner-svn-src-head@freebsd.org Mon Feb 29 23:09:32 2016 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 AFE40AB8813; Mon, 29 Feb 2016 23:09:32 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 69511F18; Mon, 29 Feb 2016 23:09:32 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1TN9VGF028774; Mon, 29 Feb 2016 23:09:31 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1TN9VUG028773; Mon, 29 Feb 2016 23:09:31 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201602292309.u1TN9VUG028773@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 29 Feb 2016 23:09:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296241 - head/sys/net80211 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: Mon, 29 Feb 2016 23:09:32 -0000 Author: glebius Date: Mon Feb 29 23:09:31 2016 New Revision: 296241 URL: https://svnweb.freebsd.org/changeset/base/296241 Log: Fix !IEEE80211_DEBUG build. Modified: head/sys/net80211/ieee80211_scan_sw.c Modified: head/sys/net80211/ieee80211_scan_sw.c ============================================================================== --- head/sys/net80211/ieee80211_scan_sw.c Mon Feb 29 21:39:00 2016 (r296240) +++ head/sys/net80211/ieee80211_scan_sw.c Mon Feb 29 23:09:31 2016 (r296241) @@ -595,9 +595,9 @@ scan_signal_locked(struct ieee80211_scan static void scan_mindwell(struct ieee80211_scan_state *ss) { - struct ieee80211vap *vap = ss->ss_vap; - IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, "%s: called\n", __func__); + IEEE80211_DPRINTF(ss->ss_vap, IEEE80211_MSG_SCAN, "%s: called\n", + __func__); scan_signal(ss, 0); } @@ -657,7 +657,6 @@ scan_curchan_task(void *arg, int pending { struct ieee80211_scan_state *ss = arg; struct scan_state *ss_priv = SCAN_PRIVATE(ss); - struct ieee80211vap *vap = ss->ss_vap; struct ieee80211com *ic = ss->ss_ic; struct ieee80211_channel *chan; unsigned long maxdwell; @@ -668,7 +667,7 @@ end: scandone = (ss->ss_next >= ss->ss_last) || (ss_priv->ss_iflags & ISCAN_CANCEL) != 0; - IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, + IEEE80211_DPRINTF(ss->ss_vap, IEEE80211_MSG_SCAN, "%s: loop start; scandone=%d\n", __func__, scandone); @@ -692,7 +691,7 @@ end: else maxdwell = ss->ss_maxdwell; - IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, + IEEE80211_DPRINTF(ss->ss_vap, IEEE80211_MSG_SCAN, "%s: chan %3d%c -> %3d%c [%s, dwell min %lums max %lums]\n", __func__, ieee80211_chan2ieee(ic, ic->ic_curchan), @@ -740,7 +739,8 @@ end: if (ss_priv->ss_iflags & (ISCAN_CANCEL|ISCAN_ABORT)) goto end; - IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, "%s: waiting\n", __func__); + IEEE80211_DPRINTF(ss->ss_vap, IEEE80211_MSG_SCAN, "%s: waiting\n", + __func__); IEEE80211_UNLOCK(ic); }