summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/ic/ar5416.c4
-rw-r--r--sys/dev/ic/ar9287.c4
-rw-r--r--sys/dev/ic/athn.c3
-rw-r--r--sys/net80211/ieee80211_node.c3
4 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/ic/ar5416.c b/sys/dev/ic/ar5416.c
index b9b6a55b07b..2df0ea48b3b 100644
--- a/sys/dev/ic/ar5416.c
+++ b/sys/dev/ic/ar5416.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5416.c,v 1.4 2009/11/17 19:32:22 damien Exp $ */
+/* $OpenBSD: ar5416.c,v 1.5 2010/03/28 13:02:57 krw Exp $ */
/*-
* Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -515,7 +515,7 @@ ar5416_set_txpower(struct athn_softc *sc, struct ieee80211_channel *c,
uint8_t tpow_ht20[8], tpow_ht40[8];
uint8_t ht40inc;
#endif
- int16_t pwr, pwroff, max_ant_gain, power[ATHN_POWER_COUNT];
+ int16_t pwr = 0, pwroff, max_ant_gain, power[ATHN_POWER_COUNT];
uint8_t cckinc;
int i;
diff --git a/sys/dev/ic/ar9287.c b/sys/dev/ic/ar9287.c
index a738d17163f..d8aef15b69d 100644
--- a/sys/dev/ic/ar9287.c
+++ b/sys/dev/ic/ar9287.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar9287.c,v 1.4 2009/11/17 19:32:22 damien Exp $ */
+/* $OpenBSD: ar9287.c,v 1.5 2010/03/28 13:02:57 krw Exp $ */
/*-
* Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -432,7 +432,7 @@ ar9287_set_txpower(struct athn_softc *sc, struct ieee80211_channel *c,
uint8_t tpow_ht20[8], tpow_ht40[8];
uint8_t ht40inc;
#endif
- int16_t pwr, max_ant_gain, power[ATHN_POWER_COUNT];
+ int16_t pwr = 0, max_ant_gain, power[ATHN_POWER_COUNT];
int i;
/* Compute transmit power reduction due to antenna gain. */
diff --git a/sys/dev/ic/athn.c b/sys/dev/ic/athn.c
index ea01087e4e9..dec4925384c 100644
--- a/sys/dev/ic/athn.c
+++ b/sys/dev/ic/athn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: athn.c,v 1.28 2010/02/24 20:09:19 damien Exp $ */
+/* $OpenBSD: athn.c,v 1.29 2010/03/28 13:02:57 krw Exp $ */
/*-
* Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -2567,6 +2567,7 @@ athn_get_pdadcs(struct athn_softc *sc, uint8_t fbin, struct athn_pier *lopier,
/* Compute Vpd table for this pdGain. */
nvpds = DB(maxpwr[i] - minpwr[i]) + 1;
+ memset(vpd, 0, sizeof(vpd));
pwr = minpwr[i];
for (j = 0; j < nvpds; j++) {
/* Get lower and higher Vpd. */
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index b2e4d827b83..d7214aebbb8 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211_node.c,v 1.56 2010/02/17 18:34:37 damien Exp $ */
+/* $OpenBSD: ieee80211_node.c,v 1.57 2010/03/28 13:02:58 krw Exp $ */
/* $NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $ */
/*-
@@ -522,6 +522,7 @@ ieee80211_end_scan(struct ifnet *ifp)
* an unnoccupied one. If that fails, pick a random
* channel from the active set.
*/
+ memset(occupied, 0, sizeof(occupied));
RB_FOREACH(ni, ieee80211_tree, &ic->ic_tree)
setbit(occupied, ieee80211_chan2ieee(ic, ni->ni_chan));
for (i = 0; i < IEEE80211_CHAN_MAX; i++)