From owner-freebsd-wireless@FreeBSD.ORG  Mon Jun 27 07:14:41 2011
Return-Path: <owner-freebsd-wireless@FreeBSD.ORG>
Delivered-To: freebsd-wireless@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 08C6A106566B
	for <freebsd-wireless@freebsd.org>;
	Mon, 27 Jun 2011 07:14:41 +0000 (UTC)
	(envelope-from adrian.chadd@gmail.com)
Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com
	[209.85.161.182])
	by mx1.freebsd.org (Postfix) with ESMTP id B8FF18FC15
	for <freebsd-wireless@freebsd.org>;
	Mon, 27 Jun 2011 07:14:40 +0000 (UTC)
Received: by gxk28 with SMTP id 28so2347773gxk.13
	for <freebsd-wireless@freebsd.org>;
	Mon, 27 Jun 2011 00:14:40 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:sender:in-reply-to:references:date
	:x-google-sender-auth:message-id:subject:from:to:content-type;
	bh=QUK4c4aYW+EDJDzGCQXRIjdjtJcFo40SM2Vot6NR3Aw=;
	b=USoaVx2svKHG+FIu+rkO4JZvyHqhuu/NDD6yTlfBbJ/QSh5JNO8IGxqnEIXm9b6bRi
	dl+TujM2gea1xBYwMOcuPrA+7mugEVB6ZMAihwNdVaYIulCHBQZUvvyAW9ZTN1hKFT56
	70hzUIxDJtNsE4stCHvYJCxZqhtpyIkLFqsH0=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:sender:in-reply-to:references:date
	:x-google-sender-auth:message-id:subject:from:to:content-type;
	b=EV421C9yCkVt0EVOzbvx+Pq9audbXBHE+V6b/4FhulCgWHvaigFXylgoGZIuUtrJ6T
	b4cBQkQjP/D6IFxQMUZ0UlZpsYLYfBWCbZUG3GFF0Ez1WvcwOaFJzLvkgEaDGVZszRjp
	pXLbkgUUkBVV2/cA5X9JuEmWj4CHv2suMtRvQ=
MIME-Version: 1.0
Received: by 10.150.212.21 with SMTP id k21mr6343817ybg.237.1309158879835;
	Mon, 27 Jun 2011 00:14:39 -0700 (PDT)
Sender: adrian.chadd@gmail.com
Received: by 10.150.146.13 with HTTP; Mon, 27 Jun 2011 00:14:39 -0700 (PDT)
In-Reply-To: <BANLkTimRkak5hNv+=y77CGbjX37y0TeVww@mail.gmail.com>
References: <BANLkTimRkak5hNv+=y77CGbjX37y0TeVww@mail.gmail.com>
Date: Mon, 27 Jun 2011 15:14:39 +0800
X-Google-Sender-Auth: gqDZdngA90nNRIo-t8HyARZqbyc
Message-ID: <BANLkTimhkGJFUUoQZAAm2cGEwET8bDkBaw@mail.gmail.com>
From: Adrian Chadd <adrian@freebsd.org>
To: freebsd-wireless@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1
Subject: Re: [PATCH] net80211: Fix bss channel on CSA reception
X-BeenThere: freebsd-wireless@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Discussions of 802.11 stack,
	tools device driver development." <freebsd-wireless.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-wireless>, 
	<mailto:freebsd-wireless-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-wireless>
List-Post: <mailto:freebsd-wireless@freebsd.org>
List-Help: <mailto:freebsd-wireless-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-wireless>, 
	<mailto:freebsd-wireless-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Jun 2011 07:14:41 -0000

That's not entirely correct; try this one:

Index: ieee80211_proto.c
===================================================================
--- ieee80211_proto.c   (revision 223525)
+++ ieee80211_proto.c   (working copy)
@@ -1509,9 +1509,12 @@
        ic->ic_csa_newchan = NULL;
        ic->ic_flags &= ~IEEE80211_F_CSAPENDING;

-       TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next)
+       TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
+               /* XXX do all VAPs need this? */
+               vap->iv_bss->ni_chan = ic->ic_curchan;
                if (vap->iv_state == IEEE80211_S_CSA)
                        ieee80211_new_state_locked(vap, IEEE80211_S_RUN, 0);
+       }
 }

 /*