Date: Sat, 27 Jun 2009 16:58:01 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r195111 - projects/mesh11s/sys/net80211 Message-ID: <200906271658.n5RGw1xw083147@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Sat Jun 27 16:58:01 2009 New Revision: 195111 URL: http://svn.freebsd.org/changeset/base/195111 Log: * Rename send action args variable to sargs * Rename send action args struct variables to something that requires less keystrokes. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_ht.c projects/mesh11s/sys/net80211/ieee80211_mesh.c projects/mesh11s/sys/net80211/ieee80211_output.c projects/mesh11s/sys/net80211/ieee80211_proto.h Modified: projects/mesh11s/sys/net80211/ieee80211_ht.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_ht.c Sat Jun 27 16:49:35 2009 (r195110) +++ projects/mesh11s/sys/net80211/ieee80211_ht.c Sat Jun 27 16:58:01 2009 (r195111) @@ -1592,7 +1592,7 @@ ieee80211_aggr_recv_action(struct ieee80 struct ieee80211_tx_ampdu *tap; uint8_t dialogtoken, policy; uint16_t baparamset, batimeout, baseqctl, code; - union ieee80211_send_action_args vargs; + union ieee80211_send_action_args sargs; int tid, ac, bufsiz; ia = (const struct ieee80211_action *) frm; @@ -1621,7 +1621,7 @@ ieee80211_aggr_recv_action(struct ieee80 rap = &ni->ni_rx_ampdu[tid]; /* Send ADDBA response */ - vargs.fixedarg[0] = dialogtoken; + sargs.arg[0] = dialogtoken; /* * NB: We ack only if the sta associated with HT and * the ap is configured to do AMPDU rx (the latter @@ -1633,7 +1633,7 @@ ieee80211_aggr_recv_action(struct ieee80 ic->ic_ampdu_rx_start(ni, rap, baparamset, batimeout, baseqctl); - vargs.fixedarg[1] = IEEE80211_STATUS_SUCCESS; + sargs.arg[1] = IEEE80211_STATUS_SUCCESS; } else { IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, @@ -1642,18 +1642,18 @@ ieee80211_aggr_recv_action(struct ieee80 "administratively disabled" : "not negotiated for station"); vap->iv_stats.is_addba_reject++; - vargs.fixedarg[1] = + sargs.arg[1] = IEEE80211_STATUS_UNSPECIFIED; } /* XXX honor rap flags? */ - vargs.fixedarg[2] = + sargs.arg[2] = IEEE80211_BAPS_POLICY_IMMEDIATE | SM(tid, IEEE80211_BAPS_TID) | SM(rap->rxa_wnd, IEEE80211_BAPS_BUFSIZ) ; - vargs.fixedarg[3] = 0; + sargs.arg[3] = 0; ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA, - IEEE80211_ACTION_BA_ADDBA_RESPONSE, vargs); + IEEE80211_ACTION_BA_ADDBA_RESPONSE, sargs); return; case IEEE80211_ACTION_BA_ADDBA_RESPONSE: @@ -1796,7 +1796,7 @@ ieee80211_ampdu_request(struct ieee80211 struct ieee80211com *ic = ni->ni_ic; int tid, dialogtoken; static int tokens = 0; /* XXX */ - union ieee80211_send_action_args vargs; + union ieee80211_send_action_args sargs; /* XXX locking */ if ((tap->txa_flags & IEEE80211_AGGR_SETUP) == 0) { @@ -1810,15 +1810,15 @@ ieee80211_ampdu_request(struct ieee80211 tid = WME_AC_TO_TID(tap->txa_ac); tap->txa_start = ni->ni_txseqs[tid]; - vargs.fixedarg[0] = dialogtoken; - vargs.fixedarg[1] = IEEE80211_BAPS_POLICY_IMMEDIATE + sargs.arg[0] = dialogtoken; + sargs.arg[1] = IEEE80211_BAPS_POLICY_IMMEDIATE | SM(tid, IEEE80211_BAPS_TID) | SM(IEEE80211_AGGR_BAWMAX, IEEE80211_BAPS_BUFSIZ) ; - vargs.fixedarg[2] = 0; /* batimeout */ + sargs.arg[2] = 0; /* batimeout */ /* NB: do first so there's no race against reply */ - if (!ic->ic_addba_request(ni, tap, dialogtoken, vargs.fixedarg[1], - vargs.fixedarg[2])) { + if (!ic->ic_addba_request(ni, tap, dialogtoken, sargs.arg[1], + sargs.arg[2])) { /* unable to setup state, don't make request */ IEEE80211_NOTE(ni->ni_vap, IEEE80211_MSG_11N, ni, "%s: could not setup BA stream for AC %d", @@ -1832,11 +1832,11 @@ ieee80211_ampdu_request(struct ieee80211 } tokens = dialogtoken; /* allocate token */ /* NB: after calling ic_addba_request so driver can set txa_start */ - vargs.fixedarg[3] = SM(tap->txa_start, IEEE80211_BASEQ_START) + sargs.arg[3] = SM(tap->txa_start, IEEE80211_BASEQ_START) | SM(0, IEEE80211_BASEQ_FRAG) ; return ic->ic_send_action(ni, IEEE80211_ACTION_CAT_BA, - IEEE80211_ACTION_BA_ADDBA_REQUEST, vargs); + IEEE80211_ACTION_BA_ADDBA_REQUEST, sargs); } /* @@ -1849,7 +1849,7 @@ ieee80211_ampdu_stop(struct ieee80211_no { struct ieee80211com *ic = ni->ni_ic; struct ieee80211vap *vap = ni->ni_vap; - union ieee80211_send_action_args vargs; + union ieee80211_send_action_args sargs; /* XXX locking */ tap->txa_flags &= ~IEEE80211_AGGR_BARPEND; @@ -1860,11 +1860,11 @@ ieee80211_ampdu_stop(struct ieee80211_no vap->iv_stats.is_ampdu_stop++; ic->ic_addba_stop(ni, tap); - vargs.fixedarg[0] = WME_AC_TO_TID(tap->txa_ac); - vargs.fixedarg[1] = IEEE80211_DELBAPS_INIT; - vargs.fixedarg[2] = reason; /* XXX reason code */ + sargs.arg[0] = WME_AC_TO_TID(tap->txa_ac); + sargs.arg[1] = IEEE80211_DELBAPS_INIT; + sargs.arg[2] = reason; /* XXX reason code */ ieee80211_send_action(ni, IEEE80211_ACTION_CAT_BA, - IEEE80211_ACTION_BA_DELBA, vargs); + IEEE80211_ACTION_BA_DELBA, sargs); } else { IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, "%s: BA stream for AC %d not running (reason %d)", Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Sat Jun 27 16:49:35 2009 (r195110) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Sat Jun 27 16:58:01 2009 (r195111) @@ -111,17 +111,16 @@ ieee80211_mesh_detach(struct ieee80211co static void mesh_vdetach_peers(void *arg, struct ieee80211_node *ni) { - union ieee80211_send_action_args vargs; + union ieee80211_send_action_args sargs; if (ni->ni_mlstate == IEEE80211_NODE_MESH_ESTABLISHED) { - vargs.fixedarg[0] = ni->ni_mlpid; - vargs.fixedarg[1] = ni->ni_mllid; - vargs.fixedarg[2] = - IEEE80211_REASON_PEER_LINK_CANCELED; + sargs.arg[0] = ni->ni_mlpid; + sargs.arg[1] = ni->ni_mllid; + sargs.arg[2] = IEEE80211_REASON_PEER_LINK_CANCELED; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, IEEE80211_ACTION_MESHPEERING_CLOSE, - vargs); + sargs); } callout_stop(&ni->ni_mltimer); } @@ -724,14 +723,14 @@ mesh_recv_mgmt(struct ieee80211_node *ni if (ni != vap->iv_bss && ms->ms_flags & IEEE80211_MESHFLAGS_AP && ni->ni_mlstate == IEEE80211_NODE_MESH_IDLE) { - union ieee80211_send_action_args vargs; + union ieee80211_send_action_args sargs; ni->ni_mlpid = mesh_generateid(vap); mesh_linkchange(ni, IEEE80211_NODE_MESH_OPENSNT); - vargs.fixedarg[0] = ni->ni_mlpid; + sargs.arg[0] = ni->ni_mlpid; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, - IEEE80211_ACTION_MESHPEERING_OPEN, vargs); + IEEE80211_ACTION_MESHPEERING_OPEN, sargs); ni->ni_mlrcnt = 0; mesh_peer_timeout_setup(ni); } @@ -851,7 +850,7 @@ mesh_recv_action(struct ieee80211_node * struct ieee80211_meshpeerver_ie *meshpeerver = NULL; struct ieee80211_meshpeer_ie meshpeercopy; uint8_t *frm, *efrm; - union ieee80211_send_action_args vargs; + union ieee80211_send_action_args sargs; wh = mtod(m0, struct ieee80211_frame *); ia = (struct ieee80211_action *) &wh[1]; @@ -955,14 +954,14 @@ mesh_recv_action(struct ieee80211_node * case IEEE80211_NODE_MESH_OPENSNT: case IEEE80211_NODE_MESH_OPENRCV: case IEEE80211_NODE_MESH_CONFIRMRCV: - vargs.fixedarg[0] = ni->ni_mlpid; - vargs.fixedarg[1] = ni->ni_mllid; - vargs.fixedarg[2] = + sargs.arg[0] = ni->ni_mlpid; + sargs.arg[1] = ni->ni_mllid; + sargs.arg[2] = IEEE80211_REASON_PEER_LINK_CANCELED; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, IEEE80211_ACTION_MESHPEERING_CLOSE, - vargs); + sargs); mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING); mesh_peer_timeout_setup(ni); @@ -981,67 +980,67 @@ mesh_recv_action(struct ieee80211_node * IEEE80211_NODE_MESH_OPENRCV); ni->ni_mllid = meshpeer->peer_llinkid; ni->ni_mlpid = mesh_generateid(vap); - vargs.fixedarg[0] = ni->ni_mlpid; + sargs.arg[0] = ni->ni_mlpid; /* Announce we're open too... */ ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, - IEEE80211_ACTION_MESHPEERING_OPEN, vargs); + IEEE80211_ACTION_MESHPEERING_OPEN, sargs); /* ...and confirm the link. */ - vargs.fixedarg[0] = ni->ni_mlpid; - vargs.fixedarg[1] = ni->ni_mllid; + sargs.arg[0] = ni->ni_mlpid; + sargs.arg[1] = ni->ni_mllid; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, IEEE80211_ACTION_MESHPEERING_CONFIRM, - vargs); + sargs); mesh_peer_timeout_setup(ni); break; case IEEE80211_NODE_MESH_OPENRCV: /* Wrong Link ID */ if (ni->ni_mllid != meshpeer->peer_llinkid) { - vargs.fixedarg[0] = ni->ni_mllid; - vargs.fixedarg[1] = ni->ni_mlpid; - vargs.fixedarg[2] = + sargs.arg[0] = ni->ni_mllid; + sargs.arg[1] = ni->ni_mlpid; + sargs.arg[2] = IEEE80211_REASON_PEER_LINK_CANCELED; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, IEEE80211_ACTION_MESHPEERING_CLOSE, - vargs); + sargs); mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING); mesh_peer_timeout_setup(ni); break; } /* Duplicate open, confirm again. */ - vargs.fixedarg[0] = ni->ni_mlpid; - vargs.fixedarg[1] = ni->ni_mllid; + sargs.arg[0] = ni->ni_mlpid; + sargs.arg[1] = ni->ni_mllid; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, IEEE80211_ACTION_MESHPEERING_CONFIRM, - vargs); + sargs); break; case IEEE80211_NODE_MESH_OPENSNT: ni->ni_mllid = meshpeer->peer_llinkid; mesh_linkchange(ni, IEEE80211_NODE_MESH_OPENRCV); - vargs.fixedarg[0] = ni->ni_mlpid; - vargs.fixedarg[1] = ni->ni_mllid; + sargs.arg[0] = ni->ni_mlpid; + sargs.arg[1] = ni->ni_mllid; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, IEEE80211_ACTION_MESHPEERING_CONFIRM, - vargs); + sargs); /* NB: don't setup/clear any timeout */ break; case IEEE80211_NODE_MESH_CONFIRMRCV: if (ni->ni_mlpid != meshpeer->peer_linkid || ni->ni_mllid != meshpeer->peer_llinkid) { - vargs.fixedarg[0] = ni->ni_mlpid; - vargs.fixedarg[1] = ni->ni_mllid; - vargs.fixedarg[2] = + sargs.arg[0] = ni->ni_mlpid; + sargs.arg[1] = ni->ni_mllid; + sargs.arg[2] = IEEE80211_REASON_PEER_LINK_CANCELED; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, IEEE80211_ACTION_MESHPEERING_CLOSE, - vargs); + sargs); mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING); mesh_peer_timeout_setup(ni); @@ -1050,45 +1049,45 @@ mesh_recv_action(struct ieee80211_node * mesh_linkchange(ni, IEEE80211_NODE_MESH_ESTABLISHED); ni->ni_mllid = meshpeer->peer_llinkid; - vargs.fixedarg[0] = ni->ni_mlpid; - vargs.fixedarg[1] = ni->ni_mllid; + sargs.arg[0] = ni->ni_mlpid; + sargs.arg[1] = ni->ni_mllid; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, IEEE80211_ACTION_MESHPEERING_CONFIRM, - vargs); + sargs); mesh_peer_timeout_stop(ni); break; case IEEE80211_NODE_MESH_ESTABLISHED: if (ni->ni_mllid != meshpeer->peer_llinkid) { - vargs.fixedarg[0] = ni->ni_mllid; - vargs.fixedarg[1] = ni->ni_mlpid; - vargs.fixedarg[2] = + sargs.arg[0] = ni->ni_mllid; + sargs.arg[1] = ni->ni_mlpid; + sargs.arg[2] = IEEE80211_REASON_PEER_LINK_CANCELED; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, IEEE80211_ACTION_MESHPEERING_CLOSE, - vargs); + sargs); mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING); mesh_peer_timeout_setup(ni); break; } - vargs.fixedarg[0] = ni->ni_mlpid; - vargs.fixedarg[1] = ni->ni_mllid; + sargs.arg[0] = ni->ni_mlpid; + sargs.arg[1] = ni->ni_mllid; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, IEEE80211_ACTION_MESHPEERING_CONFIRM, - vargs); + sargs); break; case IEEE80211_NODE_MESH_HOLDING: - vargs.fixedarg[0] = ni->ni_mlpid; - vargs.fixedarg[1] = meshpeer->peer_llinkid; - vargs.fixedarg[2] = + sargs.arg[0] = ni->ni_mlpid; + sargs.arg[1] = meshpeer->peer_llinkid; + sargs.arg[2] = IEEE80211_REASON_MESH_MAX_RETRIES; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, IEEE80211_ACTION_MESHPEERING_CLOSE, - vargs); + sargs); break; } break; @@ -1108,25 +1107,25 @@ mesh_recv_action(struct ieee80211_node * IEEE80211_NODE_MESH_CONFIRMRCV); break; case IEEE80211_NODE_MESH_HOLDING: - vargs.fixedarg[0] = ni->ni_mllid; - vargs.fixedarg[1] = ni->ni_mlpid; - vargs.fixedarg[2] = + sargs.arg[0] = ni->ni_mllid; + sargs.arg[1] = ni->ni_mlpid; + sargs.arg[2] = IEEE80211_REASON_MESH_MAX_RETRIES; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, IEEE80211_ACTION_MESHPEERING_CLOSE, - vargs); + sargs); break; case IEEE80211_NODE_MESH_CONFIRMRCV: if (ni->ni_mllid != meshpeer->peer_llinkid) { - vargs.fixedarg[0] = ni->ni_mllid; - vargs.fixedarg[1] = ni->ni_mlpid; - vargs.fixedarg[2] = + sargs.arg[0] = ni->ni_mllid; + sargs.arg[1] = ni->ni_mlpid; + sargs.arg[2] = IEEE80211_REASON_PEER_LINK_CANCELED; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, IEEE80211_ACTION_MESHPEERING_CLOSE, - vargs); + sargs); mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING); mesh_peer_timeout_setup(ni); @@ -1152,14 +1151,13 @@ mesh_recv_action(struct ieee80211_node * case IEEE80211_NODE_MESH_OPENSNT: case IEEE80211_NODE_MESH_CONFIRMRCV: case IEEE80211_NODE_MESH_ESTABLISHED: - vargs.fixedarg[0] = ni->ni_mlpid; - vargs.fixedarg[1] = ni->ni_mllid; - vargs.fixedarg[2] = - IEEE80211_REASON_MESH_CLOSE_RCVD; + sargs.arg[0] = ni->ni_mlpid; + sargs.arg[1] = ni->ni_mllid; + sargs.arg[2] = IEEE80211_REASON_MESH_CLOSE_RCVD; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, IEEE80211_ACTION_MESHPEERING_CLOSE, - vargs); + sargs); mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING); mesh_peer_timeout_setup(ni); @@ -1190,11 +1188,11 @@ mesh_recv_action(struct ieee80211_node * /* XXX: check if we are using airtime or aother algorithm */ metric = ieee80211_airtime_calc(ni); - vargs.ptrarg = &metric; + sargs.ptr = &metric; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHLMETRIC, IEEE80211_ACTION_MESHLMETRIC_REP, - vargs); + sargs); } break; case IEEE80211_ACTION_MESHLMETRIC_REP: @@ -1264,7 +1262,7 @@ mesh_peer_timeout_cb(void *arg) { struct ieee80211_node *ni = (struct ieee80211_node *)arg; struct ieee80211vap *vap = ni->ni_vap; - union ieee80211_send_action_args vargs; + union ieee80211_send_action_args sargs; IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, @@ -1278,31 +1276,30 @@ mesh_peer_timeout_cb(void *arg) case IEEE80211_NODE_MESH_OPENSNT: case IEEE80211_NODE_MESH_OPENRCV: if (ni->ni_mlrcnt == ieee80211_mesh_maxretries) { - vargs.fixedarg[0] = ni->ni_mlpid; - vargs.fixedarg[2] = IEEE80211_REASON_MESH_MAX_RETRIES; + sargs.arg[0] = ni->ni_mlpid; + sargs.arg[2] = IEEE80211_REASON_MESH_MAX_RETRIES; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, - IEEE80211_ACTION_MESHPEERING_CLOSE, vargs); + IEEE80211_ACTION_MESHPEERING_CLOSE, sargs); ni->ni_mlrcnt = 0; mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING); mesh_peer_timeout_setup(ni); } else { - vargs.fixedarg[0] = ni->ni_mlpid; + sargs.arg[0] = ni->ni_mlpid; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, - IEEE80211_ACTION_MESHPEERING_OPEN, vargs); + IEEE80211_ACTION_MESHPEERING_OPEN, sargs); ni->ni_mlrcnt++; mesh_peer_timeout_backoff(ni); } break; case IEEE80211_NODE_MESH_CONFIRMRCV: if (ni->ni_mlrcnt == ieee80211_mesh_maxretries) { - vargs.fixedarg[0] = ni->ni_mlpid; - vargs.fixedarg[2] = - IEEE80211_REASON_MESH_CONFIRM_TIMEOUT; + sargs.arg[0] = ni->ni_mlpid; + sargs.arg[2] = IEEE80211_REASON_MESH_CONFIRM_TIMEOUT; ieee80211_send_action(ni, IEEE80211_ACTION_CAT_MESHPEERING, - IEEE80211_ACTION_MESHPEERING_CLOSE, vargs); + IEEE80211_ACTION_MESHPEERING_CLOSE, sargs); ni->ni_mlrcnt = 0; mesh_linkchange(ni, IEEE80211_NODE_MESH_HOLDING); mesh_peer_timeout_setup(ni); Modified: projects/mesh11s/sys/net80211/ieee80211_output.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_output.c Sat Jun 27 16:49:35 2009 (r195110) +++ projects/mesh11s/sys/net80211/ieee80211_output.c Sat Jun 27 16:58:01 2009 (r195111) @@ -564,7 +564,7 @@ ieee80211_send_setup( */ int ieee80211_send_action(struct ieee80211_node *ni, - int category, int action, union ieee80211_send_action_args vargs) + int category, int action, union ieee80211_send_action_args sargs) { #define senderr(_x, _v) do { vap->iv_stats._v++; ret = _x; goto bad; } while (0) #define ADDSHORT(frm, v) do { \ @@ -633,43 +633,43 @@ ieee80211_send_action(struct ieee80211_n IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, "send ADDBA request: dialogtoken %d " "baparamset 0x%x (tid %d) batimeout 0x%x baseqctl 0x%x", - vargs.fixedarg[0], vargs.fixedarg[1], - MS(vargs.fixedarg[1], IEEE80211_BAPS_TID), - vargs.fixedarg[2], vargs.fixedarg[3]); - - *frm++ = vargs.fixedarg[0]; /* dialog token */ - ADDSHORT(frm, vargs.fixedarg[1]); /* baparamset */ - ADDSHORT(frm, vargs.fixedarg[2]); /* batimeout */ - ADDSHORT(frm, vargs.fixedarg[3]); /* baseqctl */ + sargs.arg[0], sargs.arg[1], + MS(sargs.arg[1], IEEE80211_BAPS_TID), + sargs.arg[2], sargs.arg[3]); + + *frm++ = sargs.arg[0]; /* dialog token */ + ADDSHORT(frm, sargs.arg[1]); /* baparamset */ + ADDSHORT(frm, sargs.arg[2]); /* batimeout */ + ADDSHORT(frm, sargs.arg[3]); /* baseqctl */ break; case IEEE80211_ACTION_BA_ADDBA_RESPONSE: IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, "send ADDBA response: dialogtoken %d status %d " "baparamset 0x%x (tid %d) batimeout %d", - vargs.fixedarg[0], vargs.fixedarg[1], - vargs.fixedarg[2], MS(vargs.fixedarg[2], - IEEE80211_BAPS_TID), vargs.fixedarg[3]); - - *frm++ = vargs.fixedarg[0]; /* dialog token */ - ADDSHORT(frm, vargs.fixedarg[1]); /* statuscode */ - ADDSHORT(frm, vargs.fixedarg[2]); /* baparamset */ - ADDSHORT(frm, vargs.fixedarg[3]); /* batimeout */ + sargs.arg[0], sargs.arg[1], + sargs.arg[2], MS(sargs.arg[2], + IEEE80211_BAPS_TID), sargs.arg[3]); + + *frm++ = sargs.arg[0]; /* dialog token */ + ADDSHORT(frm, sargs.arg[1]); /* statuscode */ + ADDSHORT(frm, sargs.arg[2]); /* baparamset */ + ADDSHORT(frm, sargs.arg[3]); /* batimeout */ break; case IEEE80211_ACTION_BA_DELBA: /* XXX */ - baparamset = SM(vargs.fixedarg[0], + baparamset = SM(sargs.arg[0], IEEE80211_DELBAPS_TID) - | vargs.fixedarg[1] + | sargs.arg[1] ; ADDSHORT(frm, baparamset); - ADDSHORT(frm, vargs.fixedarg[2]); /* reason code */ + ADDSHORT(frm, sargs.arg[2]); /* reason code */ IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_11N, ni, "send DELBA action: tid %d, initiator %d reason %d", - vargs.fixedarg[0], vargs.fixedarg[1], - vargs.fixedarg[2]); + sargs.arg[0], sargs.arg[1], + sargs.arg[2]); break; default: goto badaction; @@ -710,7 +710,7 @@ ieee80211_send_action(struct ieee80211_n IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni, "send PEER OPEN action: localid 0x%x", - vargs.fixedarg[0]); + sargs.arg[0]); ADDSHORT(frm, getcapinfo(vap, ni->ni_chan)); frm = ieee80211_add_meshpeerver(frm, vap); frm = ieee80211_add_rates(frm, rs); @@ -719,7 +719,7 @@ ieee80211_send_action(struct ieee80211_n frm = ieee80211_add_meshconf(frm, vap); frm = ieee80211_add_meshpeer(frm, IEEE80211_MESH_PEER_LINK_OPEN, - vargs.fixedarg[0], 0, 0); + sargs.arg[0], 0, 0); break; /* * mesh peer confirm action frame format: @@ -739,11 +739,11 @@ ieee80211_send_action(struct ieee80211_n IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni, "send PEER CONFIRM action: localid 0x%x, " - "peerid 0x%x", vargs.fixedarg[0], - vargs.fixedarg[1]); + "peerid 0x%x", sargs.arg[0], + sargs.arg[1]); ADDSHORT(frm, getcapinfo(vap, ni->ni_chan)); ADDSHORT(frm, 0); /* status code */ - ADDSHORT(frm, vargs.fixedarg[1]); /* AID */ + ADDSHORT(frm, sargs.arg[1]); /* AID */ frm = ieee80211_add_meshpeerver(frm, vap); frm = ieee80211_add_rates(frm, rs); frm = ieee80211_add_xrates(frm, rs); @@ -751,7 +751,7 @@ ieee80211_send_action(struct ieee80211_n frm = ieee80211_add_meshconf(frm, vap); frm = ieee80211_add_meshpeer(frm, IEEE80211_MESH_PEER_LINK_CONFIRM, - vargs.fixedarg[0], vargs.fixedarg[1], + sargs.arg[0], sargs.arg[1], 0); break; /* @@ -767,15 +767,15 @@ ieee80211_send_action(struct ieee80211_n IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni, "sending PEER CLOSE action: localid 0x%x, " - "peerid 0x%x reason %d", vargs.fixedarg[0], - vargs.fixedarg[1], vargs.fixedarg[2]); - ADDSHORT(frm, vargs.fixedarg[2]); /* reason code */ + "peerid 0x%x reason %d", sargs.arg[0], + sargs.arg[1], sargs.arg[2]); + ADDSHORT(frm, sargs.arg[2]); /* reason code */ frm = ieee80211_add_meshpeerver(frm, vap); frm = ieee80211_add_meshid(frm, vap); frm = ieee80211_add_meshpeer(frm, IEEE80211_MESH_PEER_LINK_CLOSE, - vargs.fixedarg[0], vargs.fixedarg[1], - vargs.fixedarg[2]); + sargs.arg[0], sargs.arg[1], + sargs.arg[2]); break; } break; @@ -798,7 +798,7 @@ ieee80211_send_action(struct ieee80211_n { uint32_t *metric; - metric = vargs.ptrarg; + metric = sargs.ptr; IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni, "send LINK METRIC REPLY action: metric 0x%x", Modified: projects/mesh11s/sys/net80211/ieee80211_proto.h ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_proto.h Sat Jun 27 16:49:35 2009 (r195110) +++ projects/mesh11s/sys/net80211/ieee80211_proto.h Sat Jun 27 16:58:01 2009 (r195111) @@ -66,8 +66,8 @@ void ieee80211_syncflag_ext(struct ieee8 int ieee80211_input_all(struct ieee80211com *, struct mbuf *, int, int); struct ieee80211_bpf_params; union ieee80211_send_action_args { - uint16_t fixedarg[4]; - void * ptrarg; + uint16_t arg[4]; + void * ptr; }; int ieee80211_send_action(struct ieee80211_node *, int, int, union ieee80211_send_action_args);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906271658.n5RGw1xw083147>