wlan: Partly fix set-but-unused gcc47 warning

diff --git a/sys/netproto/802_11/wlan/ieee80211_hostap.c b/sys/netproto/802_11/wlan/ieee80211_hostap.c
index a7b70dc..14bb8cb 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_hostap.c
+++ b/sys/netproto/802_11/wlan/ieee80211_hostap.c
@@ -996,7 +996,10 @@ hostap_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh,
 {
        struct ieee80211vap *vap = ni->ni_vap;
        uint8_t *challenge;
-       int allocbs, estatus;
+#ifdef IEEE80211_DEBUG
+       int allocbs;
+#endif
+       int estatus;
 
        KASSERT(vap->iv_state == IEEE80211_S_RUN, ("state %d", vap->iv_state));
 
@@ -1075,11 +1078,15 @@ hostap_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh,
                                /* NB: no way to return an error */
                                return;
                        }
+#ifdef IEEE80211_DEBUG
                        allocbs = 1;
+#endif
                } else {
                        if ((ni->ni_flags & IEEE80211_NODE_AREF) == 0)
                                (void) ieee80211_ref_node(ni);
+#ifdef IEEE80211_DEBUG
                        allocbs = 0;
+#endif
                }
                /*
                 * Mark the node as referenced to reflect that it's
@@ -2158,7 +2165,9 @@ hostap_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0,
 
        case IEEE80211_FC0_SUBTYPE_DEAUTH:
        case IEEE80211_FC0_SUBTYPE_DISASSOC: {
+#ifdef IEEE80211_DEBUG
                uint16_t reason;
+#endif
 
                if (vap->iv_state != IEEE80211_S_RUN ||
                    /* NB: can happen when in promiscuous mode */
@@ -2171,7 +2180,9 @@ hostap_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0,
                 *      [2] reason
                 */
                IEEE80211_VERIFY_LENGTH(efrm - frm, 2, return);
+#ifdef IEEE80211_DEBUG
                reason = le16toh(*(uint16_t *)frm);
+#endif
                if (subtype == IEEE80211_FC0_SUBTYPE_DEAUTH) {
                        vap->iv_stats.is_rx_deauth++;
                        IEEE80211_NODE_STAT(ni, rx_deauth);

diff --git a/sys/netproto/802_11/wlan/ieee80211_ht.c b/sys/netproto/802_11/wlan/ieee80211_ht.c
index 184be19..3e19c8b 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_ht.c
+++ b/sys/netproto/802_11/wlan/ieee80211_ht.c
@@ -1752,11 +1752,16 @@ ht_recv_action_ba_delba(struct ieee80211_node *ni,
        struct ieee80211com *ic = ni->ni_ic;
        struct ieee80211_rx_ampdu *rap;
        struct ieee80211_tx_ampdu *tap;
-       uint16_t baparamset, code;
+       uint16_t baparamset;
+#ifdef IEEE80211_DEBUG
+       uint16_t code;
+#endif
        int tid, ac;
 
        baparamset = LE_READ_2(frm+2);
+#ifdef IEEE80211_DEBUG
        code = LE_READ_2(frm+4);
+#endif
 
        tid = MS(baparamset, IEEE80211_DELBAPS_TID);
 

diff --git a/sys/netproto/802_11/wlan_wep/ieee80211_crypto_wep.c b/sys/netproto/802_11/wlan_wep/ieee80211_crypto_wep.c
index 0b7ec5d..78067f7 100644 (file)
--- a/sys/netproto/802_11/wlan_wep/ieee80211_crypto_wep.c
+++ b/sys/netproto/802_11/wlan_wep/ieee80211_crypto_wep.c
@@ -213,9 +213,13 @@ wep_decap(struct ieee80211_key *k, struct mbuf *m, int hdrlen)
 {
        struct wep_ctx *ctx = k->wk_private;
        struct ieee80211vap *vap = ctx->wc_vap;
+#ifdef IEEE80211_DEBUG
        struct ieee80211_frame *wh;
+#endif
 
+#ifdef IEEE80211_DEBUG
        wh = mtod(m, struct ieee80211_frame *);
+#endif
 
        /*
         * Check if the device handled the decrypt in hardware.