From owner-svn-src-stable@FreeBSD.ORG  Sun Nov 21 10:58:19 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 22E99106566C;
	Sun, 21 Nov 2010 10:58:19 +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 116058FC12;
	Sun, 21 Nov 2010 10:58:19 +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 oALAwI1Z052528;
	Sun, 21 Nov 2010 10:58:18 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oALAwIkp052526;
	Sun, 21 Nov 2010 10:58:18 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201011211058.oALAwIkp052526@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Sun, 21 Nov 2010 10:58:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215618 - stable/8/sys/net80211
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Nov 2010 10:58:19 -0000

Author: bschmidt
Date: Sun Nov 21 10:58:18 2010
New Revision: 215618
URL: http://svn.freebsd.org/changeset/base/215618

Log:
  MFC r199076:
  The isr_intval in ieee80211req_scan_result structure should be 16 bit.
  This makes ifconfig list scan display the correct beacon interval
  (previously it would int overflow). As a side effect, this makes the
  ieee80211req_scan_result word aligned.
  
  Submitted by:	Paul B Mahol <onemda at gmail.com>
  Committed by:	rpaulo

Modified:
  stable/8/sys/net80211/ieee80211_ioctl.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/net80211/ieee80211_ioctl.h
==============================================================================
--- stable/8/sys/net80211/ieee80211_ioctl.h	Sun Nov 21 10:56:04 2010	(r215617)
+++ stable/8/sys/net80211/ieee80211_ioctl.h	Sun Nov 21 10:58:18 2010	(r215618)
@@ -790,7 +790,7 @@ struct ieee80211req_scan_result {
 	uint16_t	isr_flags;		/* channel flags */
 	int8_t		isr_noise;
 	int8_t		isr_rssi;
-	uint8_t		isr_intval;		/* beacon interval */
+	uint16_t	isr_intval;		/* beacon interval */
 	uint8_t		isr_capinfo;		/* capabilities */
 	uint8_t		isr_erp;		/* ERP element */
 	uint8_t		isr_bssid[IEEE80211_ADDR_LEN];