kernel: Fix the build of the SOEKRIS kernel config.

It's the only one that has if_ath and 80211 in the kernel and ATH_DEBUG
and IEEE80211_DEBUG isn't set at the same time. So it caught a few
ethstr[] that were not yet under the proper #ifdef.

diff --git a/sys/dev/netif/ath/ath/if_ath.c b/sys/dev/netif/ath/ath/if_ath.c
index 058c2e9..0d4f153 100644 (file)
--- a/sys/dev/netif/ath/ath/if_ath.c
+++ b/sys/dev/netif/ath/ath/if_ath.c
@@ -5475,7 +5475,9 @@ ath_scan_start(struct ieee80211com *ic)
        struct ifnet *ifp = ic->ic_ifp;
        struct ath_softc *sc = ifp->if_softc;
        struct ath_hal *ah = sc->sc_ah;
+#ifdef ATH_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
        u_int32_t rfilt;
 
        /* XXX calibration timer? */
@@ -5496,7 +5498,9 @@ ath_scan_end(struct ieee80211com *ic)
        struct ifnet *ifp = ic->ic_ifp;
        struct ath_softc *sc = ifp->if_softc;
        struct ath_hal *ah = sc->sc_ah;
+#ifdef ATH_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
        u_int32_t rfilt;
 
        sc->sc_scanning = 0;
@@ -5554,7 +5558,9 @@ ath_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
        struct ieee80211_node *ni = NULL;
        int i, error, stamode;
        u_int32_t rfilt;
+#ifdef ATH_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
        static const HAL_LED_STATE leds[] = {
            HAL_LED_INIT,       /* IEEE80211_S_INIT */
            HAL_LED_SCAN,       /* IEEE80211_S_SCAN */

diff --git a/sys/dev/netif/ath/rate_sample/sample.c b/sys/dev/netif/ath/rate_sample/sample.c
index 1a48251..52a9d17 100644 (file)
--- a/sys/dev/netif/ath/rate_sample/sample.c
+++ b/sys/dev/netif/ath/rate_sample/sample.c
@@ -736,7 +736,9 @@ ath_rate_ctl_reset(struct ath_softc *sc, struct ieee80211_node *ni)
        const struct ieee80211_txparam *tp = ni->ni_txparms;
        struct sample_node *sn = ATH_NODE_SAMPLE(an);
        const HAL_RATE_TABLE *rt = sc->sc_currates;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
        int x, y, srate, rix;
 
        KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));

diff --git a/sys/netproto/802_11/wlan/ieee80211_adhoc.c b/sys/netproto/802_11/wlan/ieee80211_adhoc.c
index ddaa989..d9b0480 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_adhoc.c
+++ b/sys/netproto/802_11/wlan/ieee80211_adhoc.c
@@ -130,7 +130,9 @@ adhoc_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
        struct ieee80211com *ic = vap->iv_ic;
        struct ieee80211_node *ni;
        enum ieee80211_state ostate;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        ostate = vap->iv_state;
        IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (%d)\n",
@@ -294,7 +296,9 @@ adhoc_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int nf)
        uint8_t dir, type, subtype, qos;
        uint8_t *bssid;
        uint16_t rxseq;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        if (m->m_flags & M_AMPDU_MPDU) {
                /*

diff --git a/sys/netproto/802_11/wlan/ieee80211_crypto.c b/sys/netproto/802_11/wlan/ieee80211_crypto.c
index 010e7b7..bea62df 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_crypto.c
+++ b/sys/netproto/802_11/wlan/ieee80211_crypto.c
@@ -492,7 +492,9 @@ int
 ieee80211_crypto_setkey(struct ieee80211vap *vap, struct ieee80211_key *key)
 {
        const struct ieee80211_cipher *cip = key->wk_cipher;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        KASSERT(cip != NULL, ("No cipher!"));
 

diff --git a/sys/netproto/802_11/wlan/ieee80211_hostap.c b/sys/netproto/802_11/wlan/ieee80211_hostap.c
index ac6d04e..a7b70dc 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_hostap.c
+++ b/sys/netproto/802_11/wlan/ieee80211_hostap.c
@@ -156,7 +156,9 @@ hostap_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
        struct ieee80211com *ic = vap->iv_ic;
        enum ieee80211_state ostate;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        ostate = vap->iv_state;
        IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, "%s: %s -> %s (%d)\n",
@@ -481,7 +483,9 @@ hostap_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int nf)
        uint8_t dir, type, subtype, qos;
        uint8_t *bssid;
        uint16_t rxseq;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        if (m->m_flags & M_AMPDU_MPDU) {
                /*

diff --git a/sys/netproto/802_11/wlan/ieee80211_ht.c b/sys/netproto/802_11/wlan/ieee80211_ht.c
index cbdd1be..184be19 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_ht.c
+++ b/sys/netproto/802_11/wlan/ieee80211_ht.c
@@ -2152,7 +2152,9 @@ ht_send_action_ba_addba(struct ieee80211_node *ni,
        uint16_t *args = arg0;
        struct mbuf *m;
        uint8_t *frm;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni,
            "send ADDBA %s: dialogtoken %d "
@@ -2200,7 +2202,9 @@ ht_send_action_ba_delba(struct ieee80211_node *ni,
        struct mbuf *m;
        uint16_t baparamset;
        uint8_t *frm;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        baparamset = SM(args[0], IEEE80211_DELBAPS_TID)
                   | args[1]
@@ -2242,7 +2246,9 @@ ht_send_action_ht_txchwidth(struct ieee80211_node *ni,
        struct ieee80211com *ic = ni->ni_ic;
        struct mbuf *m;
        uint8_t *frm;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni,
            "send HT txchwidth: width %d",

diff --git a/sys/netproto/802_11/wlan/ieee80211_node.c b/sys/netproto/802_11/wlan/ieee80211_node.c
index c3407a9..4302d25 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_node.c
+++ b/sys/netproto/802_11/wlan/ieee80211_node.c
@@ -575,8 +575,8 @@ ieee80211_ibss_merge(struct ieee80211_node *ni)
        struct ieee80211vap *vap = ni->ni_vap;
 #ifdef IEEE80211_DEBUG
        struct ieee80211com *ic = ni->ni_ic;
-#endif
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        if (ni == vap->iv_bss ||
            IEEE80211_ADDR_EQ(ni->ni_bssid, vap->iv_bss->ni_bssid)) {
@@ -1094,7 +1094,9 @@ ieee80211_alloc_node(struct ieee80211_node_table *nt,
        struct ieee80211com *ic = nt->nt_ic;
        struct ieee80211_node *ni;
        int hash;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        ni = ic->ic_node_alloc(vap, macaddr);
        if (ni == NULL) {
@@ -1147,7 +1149,9 @@ ieee80211_tmp_node(struct ieee80211vap *vap,
 {
        struct ieee80211com *ic = vap->iv_ic;
        struct ieee80211_node *ni;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        ni = ic->ic_node_alloc(vap, macaddr);
        if (ni != NULL) {
@@ -1367,7 +1371,9 @@ ieee80211_fakeup_adhoc_node(struct ieee80211vap *vap,
        const uint8_t macaddr[IEEE80211_ADDR_LEN])
 {
        struct ieee80211_node *ni;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE,
            "%s: mac<%s>\n", __func__, kether_ntoa(macaddr, ethstr));
@@ -1453,7 +1459,9 @@ ieee80211_add_neighbor(struct ieee80211vap *vap,
        const struct ieee80211_scanparams *sp)
 {
        struct ieee80211_node *ni;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE,
            "%s: mac<%s>\n", __func__, kether_ntoa(wh->i_addr2, ethstr));
@@ -1532,7 +1540,9 @@ ieee80211_find_rxnode_withkey(struct ieee80211com *ic,
 {
        struct ieee80211_node_table *nt;
        struct ieee80211_node *ni;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        nt = &ic->ic_sta;
        if (nt->nt_keyixmap != NULL && keyix < nt->nt_keyixmax)
@@ -1658,7 +1668,9 @@ ieee80211_free_node(struct ieee80211_node *ni)
 #endif
 {
        struct ieee80211_node_table *nt = ni->ni_table;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
 #ifdef IEEE80211_DEBUG_REFCNT
        IEEE80211_DPRINTF(ni->ni_vap, IEEE80211_MSG_NODE,
@@ -1706,7 +1718,9 @@ ieee80211_node_delucastkey(struct ieee80211_node *ni)
        struct ieee80211_node *nikey;
        ieee80211_keyix keyix;
        int status;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        /*
         * NB: We must beware of LOR here; deleting the key
@@ -1752,7 +1766,9 @@ static void
 node_reclaim(struct ieee80211_node_table *nt, struct ieee80211_node *ni)
 {
        ieee80211_keyix keyix;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        IEEE80211_DPRINTF(ni->ni_vap, IEEE80211_MSG_NODE,
                "%s: remove %p<%s> from %s table, refcnt %d\n",

diff --git a/sys/netproto/802_11/wlan/ieee80211_output.c b/sys/netproto/802_11/wlan/ieee80211_output.c
index d8cb285..f061a0b 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_output.c
+++ b/sys/netproto/802_11/wlan/ieee80211_output.c
@@ -1721,7 +1721,9 @@ ieee80211_send_probereq(struct ieee80211_node *ni,
        const struct ieee80211_rateset *rs;
        struct mbuf *m;
        uint8_t *frm;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        if (vap->iv_state == IEEE80211_S_CAC) {
                IEEE80211_NOTE(vap, IEEE80211_MSG_OUTPUT, ni,
@@ -1870,7 +1872,9 @@ ieee80211_send_mgmt(struct ieee80211_node *ni, int type, int arg)
        uint8_t *frm;
        uint16_t capinfo;
        int has_challenge, is_shared_key, ret, status;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        KASSERT(ni != NULL, ("null node"));
 
@@ -2381,7 +2385,9 @@ ieee80211_send_proberesp(struct ieee80211vap *vap,
        struct ieee80211_node *bss = vap->iv_bss;
        struct ieee80211com *ic = vap->iv_ic;
        struct mbuf *m;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        if (vap->iv_state == IEEE80211_S_CAC) {
                IEEE80211_NOTE(vap, IEEE80211_MSG_OUTPUT, bss,

diff --git a/sys/netproto/802_11/wlan/ieee80211_scan_sta.c b/sys/netproto/802_11/wlan/ieee80211_scan_sta.c
index d4e76ed..795bc9b 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_scan_sta.c
+++ b/sys/netproto/802_11/wlan/ieee80211_scan_sta.c
@@ -954,7 +954,9 @@ match_bss(struct ieee80211vap *vap,
        struct ieee80211_scan_entry *se = &se0->base;
         uint8_t rate;
         int fail;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        fail = 0;
        if (isclr(ic->ic_chan_active, ieee80211_chan2ieee(ic, se->se_chan)))

diff --git a/sys/netproto/802_11/wlan/ieee80211_wds.c b/sys/netproto/802_11/wlan/ieee80211_wds.c
index e0048a8..b4084ef 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_wds.c
+++ b/sys/netproto/802_11/wlan/ieee80211_wds.c
@@ -123,7 +123,9 @@ ieee80211_create_wds(struct ieee80211vap *vap, struct ieee80211_channel *chan)
        struct ieee80211com *ic = vap->iv_ic;
 /*     struct ieee80211_node_table *nt = &ic->ic_sta;*/
        struct ieee80211_node *ni, *obss;
+#ifdef IEEE80211_DEBUG
        char ethstr[ETHER_ADDRSTRLEN + 1];
+#endif
 
        IEEE80211_DPRINTF(vap, IEEE80211_MSG_WDS,
             "%s: creating link to %s on channel %u\n", __func__,