From owner-svn-src-all@freebsd.org  Sat Dec  3 17:27:11 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 979F2C65EA5;
 Sat,  3 Dec 2016 17:27:11 +0000 (UTC)
 (envelope-from avos@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 676832B5;
 Sat,  3 Dec 2016 17:27:11 +0000 (UTC)
 (envelope-from avos@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB3HRA5Q015531;
 Sat, 3 Dec 2016 17:27:10 GMT (envelope-from avos@FreeBSD.org)
Received: (from avos@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB3HRAak015530;
 Sat, 3 Dec 2016 17:27:10 GMT (envelope-from avos@FreeBSD.org)
Message-Id: <201612031727.uB3HRAak015530@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avos set sender to
 avos@FreeBSD.org using -f
From: Andriy Voskoboinyk <avos@FreeBSD.org>
Date: Sat, 3 Dec 2016 17:27:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r309486 - head/sys/dev/rtwn
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Dec 2016 17:27:11 -0000

Author: avos
Date: Sat Dec  3 17:27:10 2016
New Revision: 309486
URL: https://svnweb.freebsd.org/changeset/base/309486

Log:
  rtwn: fix bitmap size calculation.
  
  Tested with RTL8188CE, STA mode.

Modified:
  head/sys/dev/rtwn/if_rtwnvar.h

Modified: head/sys/dev/rtwn/if_rtwnvar.h
==============================================================================
--- head/sys/dev/rtwn/if_rtwnvar.h	Sat Dec  3 17:17:42 2016	(r309485)
+++ head/sys/dev/rtwn/if_rtwnvar.h	Sat Dec  3 17:27:10 2016	(r309486)
@@ -207,8 +207,8 @@ struct rtwn_softc {
 	int			vaps_running;
 	int			monvaps_running;
 
-	uint16_t	next_rom_addr;
-	uint8_t		keys_bmap[roundup2(RTWN_CAM_ENTRY_LIMIT, NBBY)];
+	uint16_t		next_rom_addr;
+	uint8_t			keys_bmap[howmany(RTWN_CAM_ENTRY_LIMIT, NBBY)];
 
 	struct rtwn_vap		*vaps[RTWN_PORT_COUNT];
 	struct ieee80211_node	*node_list[RTWN_MACID_LIMIT];