svn commit: r215619 - stable/7/sys/net80211

[Bernhard Schmidt]

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

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/7/sys/net80211/ieee80211_ioctl.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/net80211/ieee80211_ioctl.h
==============================================================================
--- stable/7/sys/net80211/ieee80211_ioctl.h	Sun Nov 21 10:58:18 2010	(r215618)
+++ stable/7/sys/net80211/ieee80211_ioctl.h	Sun Nov 21 10:58:37 2010	(r215619)
@@ -530,7 +530,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];