summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Bergamini <damien@cvs.openbsd.org>2006-11-15 18:59:38 +0000
committerDamien Bergamini <damien@cvs.openbsd.org>2006-11-15 18:59:38 +0000
commit49250a6227f4f147cd84b3a5b276d56b09cbae39 (patch)
treed8cb1fe40a83e02326090cae3e51f66a52838e22
parente18952f867bd725a272116b9df6aae3be96e5489 (diff)
s/roundup/howmany/ where it makes sense.
-rw-r--r--sys/net80211/ieee80211_node.c4
-rw-r--r--sys/net80211/ieee80211_var.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index 2c87a7a33aa..151ad97c49e 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_node.c,v 1.17 2006/11/13 20:32:45 damien Exp $ */
+/* $OpenBSD: ieee80211_node.c,v 1.18 2006/11/15 18:59:37 damien Exp $ */
/* $NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $ */
/*-
@@ -390,7 +390,7 @@ ieee80211_end_scan(struct ifnet *ifp)
if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
/* XXX off stack? */
- u_char occupied[roundup(IEEE80211_CHAN_MAX, NBBY)];
+ u_char occupied[howmany(IEEE80211_CHAN_MAX, NBBY)];
/*
* The passive scan to look for existing AP's completed,
* select a channel to camp on. Identify the channels
diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h
index 81c5d085982..8688b406a70 100644
--- a/sys/net80211/ieee80211_var.h
+++ b/sys/net80211/ieee80211_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_var.h,v 1.17 2006/10/19 10:55:56 tom Exp $ */
+/* $OpenBSD: ieee80211_var.h,v 1.18 2006/11/15 18:59:37 damien Exp $ */
/* $NetBSD: ieee80211_var.h,v 1.7 2004/05/06 03:07:10 dyoung Exp $ */
/*-
@@ -160,9 +160,9 @@ struct ieee80211com {
u_int8_t ic_myaddr[IEEE80211_ADDR_LEN];
struct ieee80211_rateset ic_sup_rates[IEEE80211_MODE_MAX];
struct ieee80211_channel ic_channels[IEEE80211_CHAN_MAX+1];
- u_char ic_chan_avail[roundup(IEEE80211_CHAN_MAX,NBBY)];
- u_char ic_chan_active[roundup(IEEE80211_CHAN_MAX, NBBY)];
- u_char ic_chan_scan[roundup(IEEE80211_CHAN_MAX,NBBY)];
+ u_char ic_chan_avail[howmany(IEEE80211_CHAN_MAX,NBBY)];
+ u_char ic_chan_active[howmany(IEEE80211_CHAN_MAX, NBBY)];
+ u_char ic_chan_scan[howmany(IEEE80211_CHAN_MAX,NBBY)];
struct ifqueue ic_mgtq;
struct ifqueue ic_pwrsaveq;
u_int ic_scan_lock; /* user-initiated scan */