Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 01 Mar 2016 08:33:20 +0200
From:      "Andriy Voskoboinyk" <avos@freebsd.org>
To:        "Gleb Smirnoff" <glebius@freebsd.org>
Cc:        "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
Subject:   Re: svn commit: r296241 - head/sys/net80211
Message-ID:  <op.ydmu5uoh4dikkl@localhost>
In-Reply-To: <201602292309.u1TN9VUG028773@repo.freebsd.org>
References:  <201602292309.u1TN9VUG028773@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Tue, 01 Mar 2016 01:09:31 +0200 =D0=B1=D1=83=D0=BB=D0=BE =D0=BD=D0=B0=D0=
=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=BE Gleb Smirnoff  =

<glebius@freebsd.org>:

Thanks!

> 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
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D
> --- 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 =3D 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 =3D arg;
>  	struct scan_state *ss_priv =3D SCAN_PRIVATE(ss);
> -	struct ieee80211vap *vap =3D ss->ss_vap;
>  	struct ieee80211com *ic =3D ss->ss_ic;
>  	struct ieee80211_channel *chan;
>  	unsigned long maxdwell;
> @@ -668,7 +667,7 @@ end:
>  	scandone =3D (ss->ss_next >=3D ss->ss_last) ||
>  	    (ss_priv->ss_iflags & ISCAN_CANCEL) !=3D 0;
> -	IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
> +	IEEE80211_DPRINTF(ss->ss_vap, IEEE80211_MSG_SCAN,
>  	    "%s: loop start; scandone=3D%d\n",
>  	    __func__,
>  	    scandone);
> @@ -692,7 +691,7 @@ end:
>  	else
>  		maxdwell =3D 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);
>  }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?op.ydmu5uoh4dikkl>