kernel/802_11: Remove unused variables.

diff --git a/sys/netproto/802_11/wlan/ieee80211_adhoc.c b/sys/netproto/802_11/wlan/ieee80211_adhoc.c
index a493257..1af7f77 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_adhoc.c
+++ b/sys/netproto/802_11/wlan/ieee80211_adhoc.c
@@ -683,7 +683,7 @@ adhoc_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0,
        struct ieee80211vap *vap = ni->ni_vap;
        struct ieee80211com *ic = ni->ni_ic;
        struct ieee80211_frame *wh;
-       uint8_t *frm, *efrm, *sfrm;
+       uint8_t *frm, *efrm;
        uint8_t *ssid, *rates, *xrates;
 
        wh = mtod(m0, struct ieee80211_frame *);
@@ -776,7 +776,6 @@ adhoc_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m0,
                 *      [tlv] extended supported rates
                 */
                ssid = rates = xrates = NULL;
-               sfrm = frm;
                while (efrm - frm > 1) {
                        IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, return);
                        switch (*frm) {

diff --git a/sys/netproto/802_11/wlan/ieee80211_hostap.c b/sys/netproto/802_11/wlan/ieee80211_hostap.c
index b2cbc8a..2475163 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_hostap.c
+++ b/sys/netproto/802_11/wlan/ieee80211_hostap.c
@@ -407,8 +407,7 @@ hostap_deliver_data(struct ieee80211vap *vap,
                        }
                }
                if (mcopy != NULL) {
-                       int len, err;
-                       len = mcopy->m_pkthdr.len;
+                       int err;
                        err = ieee80211_handoff(ifp, mcopy);
                        if (err) {
                                /* NB: IFQ_HANDOFF reclaims mcopy */

diff --git a/sys/netproto/802_11/wlan/ieee80211_ht.c b/sys/netproto/802_11/wlan/ieee80211_ht.c
index 94adf66..3f2cc5d 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_ht.c
+++ b/sys/netproto/802_11/wlan/ieee80211_ht.c
@@ -1558,8 +1558,10 @@ ieee80211_addba_response(struct ieee80211_node *ni,
        struct ieee80211_tx_ampdu *tap,
        int status, int baparamset, int batimeout)
 {
-       int bufsiz, tid;
-
+       int bufsiz;
+#if 0
+       int tid;
+#endif
        /* XXX locking */
        addba_stop_timeout(tap);
        if (status == IEEE80211_STATUS_SUCCESS) {
@@ -1568,7 +1570,9 @@ ieee80211_addba_response(struct ieee80211_node *ni,
                tap->txa_wnd = (bufsiz == 0) ?
                    IEEE80211_AGGR_BAWMAX : min(bufsiz, IEEE80211_AGGR_BAWMAX);
                /* XXX AC/TID */
+#if 0
                tid = MS(baparamset, IEEE80211_BAPS_TID);
+#endif
                tap->txa_flags |= IEEE80211_AGGR_RUNNING;
                tap->txa_attempts = 0;
        } else {

diff --git a/sys/netproto/802_11/wlan/ieee80211_ioctl.c b/sys/netproto/802_11/wlan/ieee80211_ioctl.c
index a31dad7..207543d 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_ioctl.c
+++ b/sys/netproto/802_11/wlan/ieee80211_ioctl.c
@@ -2285,11 +2285,9 @@ static __noinline int
 ieee80211_ioctl_setappie(struct ieee80211vap *vap,
        const struct ieee80211req *ireq)
 {
-       struct ieee80211com *ic = vap->iv_ic;
        int error;
        uint8_t fc0;
 
-       ic = vap->iv_ic;
        fc0 = ireq->i_val & 0xff;
        if ((fc0 & IEEE80211_FC0_TYPE_MASK) != IEEE80211_FC0_TYPE_MGT)
                return EINVAL;

diff --git a/sys/netproto/802_11/wlan/ieee80211_mesh.c b/sys/netproto/802_11/wlan/ieee80211_mesh.c
index ddc1db5..ee42c3d 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_mesh.c
+++ b/sys/netproto/802_11/wlan/ieee80211_mesh.c
@@ -516,7 +516,6 @@ mesh_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
        struct ieee80211_mesh_state *ms = vap->iv_mesh;
        struct ieee80211com *ic = vap->iv_ic;
-       struct ieee80211_node *ni;
        enum ieee80211_state ostate;
 
        ostate = vap->iv_state;
@@ -526,7 +525,6 @@ mesh_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
        vap->iv_state = nstate;         /* state transition */
        if (ostate != IEEE80211_S_SCAN)
                ieee80211_cancel_scan(vap);     /* background scan */
-       ni = vap->iv_bss;                       /* NB: no reference held */
        if (nstate != IEEE80211_S_RUN && ostate == IEEE80211_S_RUN)
                callout_stop(&ms->ms_cleantimer);
        switch (nstate) {

diff --git a/sys/netproto/802_11/wlan/ieee80211_output.c b/sys/netproto/802_11/wlan/ieee80211_output.c
index fee8b19..d519cc3 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_output.c
+++ b/sys/netproto/802_11/wlan/ieee80211_output.c
@@ -1712,7 +1712,6 @@ ieee80211_send_probereq(struct ieee80211_node *ni,
        struct ieee80211com *ic = ni->ni_ic;
        const struct ieee80211_txparam *tp;
        struct ieee80211_bpf_params params;
-       struct ieee80211_frame *wh;
        const struct ieee80211_rateset *rs;
        struct mbuf *m;
        uint8_t *frm;
@@ -1788,7 +1787,6 @@ ieee80211_send_probereq(struct ieee80211_node *ni,
                return ENOMEM;
        }
 
-       wh = mtod(m, struct ieee80211_frame *);
        ieee80211_send_setup(ni, m,
             IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_REQ,
             IEEE80211_NONQOS_TID, sa, da, bssid);
@@ -2374,7 +2372,6 @@ ieee80211_send_proberesp(struct ieee80211vap *vap,
 {
        struct ieee80211_node *bss = vap->iv_bss;
        struct ieee80211com *ic = vap->iv_ic;
-       struct ieee80211_frame *wh;
        struct mbuf *m;
 
        if (vap->iv_state == IEEE80211_S_CAC) {
@@ -2404,7 +2401,6 @@ ieee80211_send_proberesp(struct ieee80211vap *vap,
        M_PREPEND(m, sizeof(struct ieee80211_frame), MB_DONTWAIT);
        KASSERT(m != NULL, ("no room for header"));
 
-       wh = mtod(m, struct ieee80211_frame *);
        ieee80211_send_setup(bss, m,
             IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_RESP,
             IEEE80211_NONQOS_TID, vap->iv_myaddr, da, bss->ni_bssid);

diff --git a/sys/netproto/802_11/wlan/ieee80211_power.c b/sys/netproto/802_11/wlan/ieee80211_power.c
index 24c70e1..1137bc2 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_power.c
+++ b/sys/netproto/802_11/wlan/ieee80211_power.c
@@ -272,11 +272,9 @@ static int
 ieee80211_set_tim(struct ieee80211_node *ni, int set)
 {
        struct ieee80211vap *vap = ni->ni_vap;
-       struct ieee80211com *ic = ni->ni_ic;
        uint16_t aid;
        int changed;
 
-       ic = ni->ni_ic;
        KASSERT(vap->iv_opmode == IEEE80211_M_HOSTAP ||
                vap->iv_opmode == IEEE80211_M_IBSS,
                ("operating mode %u", vap->iv_opmode));

diff --git a/sys/netproto/802_11/wlan/ieee80211_proto.c b/sys/netproto/802_11/wlan/ieee80211_proto.c
index 9e68165..4ba3c4d 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_proto.c
+++ b/sys/netproto/802_11/wlan/ieee80211_proto.c
@@ -931,9 +931,6 @@ ieee80211_wme_initparams_locked(struct ieee80211vap *vap)
 void
 ieee80211_wme_initparams(struct ieee80211vap *vap)
 {
-       struct ieee80211com *ic = vap->iv_ic;
-
-       ic = vap->iv_ic;
        ieee80211_wme_initparams_locked(vap);
 }
 
@@ -1288,9 +1285,6 @@ ieee80211_stop_locked(struct ieee80211vap *vap)
 void
 ieee80211_stop(struct ieee80211vap *vap)
 {
-       struct ieee80211com *ic = vap->iv_ic;
-
-       ic = vap->iv_ic;
        ieee80211_stop_locked(vap);
 }
 
@@ -1859,10 +1853,8 @@ int
 ieee80211_new_state(struct ieee80211vap *vap,
        enum ieee80211_state nstate, int arg)
 {
-       struct ieee80211com *ic = vap->iv_ic;
        int rc;
 
-       ic = vap->iv_ic;
        rc = ieee80211_new_state_locked(vap, nstate, arg);
        return rc;
 }

diff --git a/sys/netproto/802_11/wlan/ieee80211_scan.c b/sys/netproto/802_11/wlan/ieee80211_scan.c
index 7ea69aa..13a5e31 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_scan.c
+++ b/sys/netproto/802_11/wlan/ieee80211_scan.c
@@ -441,11 +441,9 @@ ieee80211_start_scan(struct ieee80211vap *vap, int flags,
        u_int duration, u_int mindwell, u_int maxdwell,
        u_int nssid, const struct ieee80211_scan_ssid ssids[])
 {
-       struct ieee80211com *ic = vap->iv_ic;
        const struct ieee80211_scanner *scan;
        int result;
 
-       ic = vap->iv_ic;
        scan = ieee80211_scanner_get(vap->iv_opmode);
        if (scan == NULL) {
                IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
@@ -811,9 +809,6 @@ scan_signal(struct ieee80211_scan_state *ss)
 static void
 scan_mindwell(struct ieee80211_scan_state *ss)
 {
-       struct ieee80211com *ic = ss->ss_ic;
-
-       ic = ss->ss_ic;
        scan_signal(ss);
 }
 

diff --git a/sys/netproto/802_11/wlan/ieee80211_wds.c b/sys/netproto/802_11/wlan/ieee80211_wds.c
index b7b6e4c..db5c1c6 100644 (file)
--- a/sys/netproto/802_11/wlan/ieee80211_wds.c
+++ b/sys/netproto/802_11/wlan/ieee80211_wds.c
@@ -336,7 +336,6 @@ static int
 wds_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
        struct ieee80211com *ic = vap->iv_ic;
-       struct ieee80211_node *ni;
        enum ieee80211_state ostate;
        int error;
 
@@ -347,7 +346,6 @@ wds_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
        callout_stop(&vap->iv_mgtsend);         /* XXX callout_drain */
        if (ostate != IEEE80211_S_SCAN)
                ieee80211_cancel_scan(vap);     /* background scan */
-       ni = vap->iv_bss;                       /* NB: no reference held */
        error = 0;
        switch (nstate) {
        case IEEE80211_S_INIT: