From owner-svn-src-head@FreeBSD.ORG  Wed Jan 28 18:37:47 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1F38910656C8;
	Wed, 28 Jan 2009 18:37:47 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0C7478FC34;
	Wed, 28 Jan 2009 18:37:47 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0SIbk7T028787;
	Wed, 28 Jan 2009 18:37:46 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0SIbk56028786;
	Wed, 28 Jan 2009 18:37:46 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200901281837.n0SIbk56028786@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Wed, 28 Jan 2009 18:37:46 +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: r187834 - head/sys/net80211
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jan 2009 18:37:47 -0000

Author: sam
Date: Wed Jan 28 18:37:46 2009
New Revision: 187834
URL: http://svn.freebsd.org/changeset/base/187834

Log:
  change null_getradiocaps to return the actual count of channels instead
  of the true number; otherwise the caller may use the count to do things
  with the data it should not (e.g. sort the channel table)

Modified:
  head/sys/net80211/ieee80211_regdomain.c

Modified: head/sys/net80211/ieee80211_regdomain.c
==============================================================================
--- head/sys/net80211/ieee80211_regdomain.c	Wed Jan 28 18:14:24 2009	(r187833)
+++ head/sys/net80211/ieee80211_regdomain.c	Wed Jan 28 18:37:46 2009	(r187834)
@@ -48,10 +48,10 @@ null_getradiocaps(struct ieee80211com *i
 	int *n, struct ieee80211_channel *c)
 {
 	/* just feed back the current channel list */
-	*n = ic->ic_nchans;		/* XXX return count copied? */
 	if (maxchan > ic->ic_nchans)
 		maxchan = ic->ic_nchans;
 	memcpy(c, ic->ic_channels, maxchan*sizeof(struct ieee80211_channel));
+	*n = maxchan;
 }
 
 static int