svn commit: r194884 - projects/mesh11s/sys/net80211
Rui Paulo
rpaulo at FreeBSD.org
Wed Jun 24 18:50:42 UTC 2009
Author: rpaulo
Date: Wed Jun 24 18:50:41 2009
New Revision: 194884
URL: http://svn.freebsd.org/changeset/base/194884
Log:
s/CONFIRMRECV/CONFIRMRCV to match OPENRCV.
Sponsored by: The FreeBSD Foundation
Modified:
projects/mesh11s/sys/net80211/ieee80211_mesh.c
projects/mesh11s/sys/net80211/ieee80211_node.h
Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c Wed Jun 24 18:50:05 2009 (r194883)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Wed Jun 24 18:50:41 2009 (r194884)
@@ -155,8 +155,13 @@ mesh_newstate(struct ieee80211vap *vap,
ni = vap->iv_bss; /* NB: no reference held */
switch (nstate) {
case IEEE80211_S_INIT:
- if (ostate == IEEE80211_S_SCAN)
+ switch (ostate) {
+ case IEEE80211_S_SCAN:
ieee80211_cancel_scan(vap);
+ break;
+ default:
+ break;
+ }
if (ostate != IEEE80211_S_INIT) {
/* NB: optimize INIT -> INIT case */
ieee80211_reset_bss(vap);
@@ -170,7 +175,7 @@ mesh_newstate(struct ieee80211vap *vap,
vap->iv_meshidlen != 0) {
/*
* Already have a channel and a mesh ID; bypass
- * the * scan and startup immediately.
+ * the scan and startup immediately.
*/
ieee80211_create_mbss(vap, vap->iv_des_chan);
break;
@@ -242,7 +247,7 @@ mesh_linkchange(struct ieee80211_node *n
[IEEE80211_NODE_MESH_IDLE] = "IDLE",
[IEEE80211_NODE_MESH_OPENSNT] = "OPEN SENT",
[IEEE80211_NODE_MESH_OPENRCV] = "OPEN RECEIVED",
- [IEEE80211_NODE_MESH_CONFIRMRECV] = "CONFIRM RECEIVED",
+ [IEEE80211_NODE_MESH_CONFIRMRCV] = "CONFIRM RECEIVED",
[IEEE80211_NODE_MESH_ESTABLISHED] = "ESTABLISHED",
[IEEE80211_NODE_MESH_HOLDING] = "HOLDING"
};
@@ -892,7 +897,7 @@ mesh_recv_action(struct ieee80211_node *
break;
case IEEE80211_NODE_MESH_OPENSNT:
case IEEE80211_NODE_MESH_OPENRCV:
- case IEEE80211_NODE_MESH_CONFIRMRECV:
+ case IEEE80211_NODE_MESH_CONFIRMRCV:
vargs.fixedarg[0] = ni->ni_mlpid;
vargs.fixedarg[1] = ni->ni_mllid;
vargs.fixedarg[2] =
@@ -969,7 +974,7 @@ mesh_recv_action(struct ieee80211_node *
vargs);
/* NB: don't setup/clear any timeout */
break;
- case IEEE80211_NODE_MESH_CONFIRMRECV:
+ case IEEE80211_NODE_MESH_CONFIRMRCV:
if (ni->ni_mlpid != meshpeer->peer_linkid ||
ni->ni_mllid != meshpeer->peer_llinkid) {
vargs.fixedarg[0] = ni->ni_mlpid;
@@ -1043,7 +1048,7 @@ mesh_recv_action(struct ieee80211_node *
break;
case IEEE80211_NODE_MESH_OPENSNT:
mesh_linkchange(ni,
- IEEE80211_NODE_MESH_CONFIRMRECV);
+ IEEE80211_NODE_MESH_CONFIRMRCV);
break;
case IEEE80211_NODE_MESH_HOLDING:
vargs.fixedarg[0] = ni->ni_mllid;
@@ -1055,7 +1060,7 @@ mesh_recv_action(struct ieee80211_node *
IEEE80211_ACTION_MESHPEERING_CLOSE,
vargs);
break;
- case IEEE80211_NODE_MESH_CONFIRMRECV:
+ case IEEE80211_NODE_MESH_CONFIRMRCV:
if (ni->ni_mllid != meshpeer->peer_llinkid) {
vargs.fixedarg[0] = ni->ni_mllid;
vargs.fixedarg[1] = ni->ni_mlpid;
@@ -1088,7 +1093,7 @@ mesh_recv_action(struct ieee80211_node *
break;
case IEEE80211_NODE_MESH_OPENRCV:
case IEEE80211_NODE_MESH_OPENSNT:
- case IEEE80211_NODE_MESH_CONFIRMRECV:
+ case IEEE80211_NODE_MESH_CONFIRMRCV:
case IEEE80211_NODE_MESH_ESTABLISHED:
vargs.fixedarg[0] = ni->ni_mllid;
vargs.fixedarg[1] = ni->ni_mlpid;
@@ -1160,7 +1165,7 @@ mesh_peer_timeout_setup(struct ieee80211
case IEEE80211_NODE_MESH_HOLDING:
ni->ni_mltval = HOLDING_TIMEOUT;
break;
- case IEEE80211_NODE_MESH_CONFIRMRECV:
+ case IEEE80211_NODE_MESH_CONFIRMRCV:
ni->ni_mltval = CONFIRM_TIMEOUT;
break;
case IEEE80211_NODE_MESH_IDLE:
@@ -1233,7 +1238,7 @@ mesh_peer_timeout_cb(void *arg)
mesh_peer_timeout_backoff(ni);
}
break;
- case IEEE80211_NODE_MESH_CONFIRMRECV:
+ case IEEE80211_NODE_MESH_CONFIRMRCV:
if (ni->ni_mlrcnt == ieee80211_mesh_maxretries) {
vargs.fixedarg[0] = ni->ni_mlpid;
vargs.fixedarg[2] =
Modified: projects/mesh11s/sys/net80211/ieee80211_node.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_node.h Wed Jun 24 18:50:05 2009 (r194883)
+++ projects/mesh11s/sys/net80211/ieee80211_node.h Wed Jun 24 18:50:41 2009 (r194884)
@@ -94,9 +94,9 @@ struct ieee80211_ies {
*/
enum ieee80211_mesh_mlstate {
IEEE80211_NODE_MESH_IDLE = 0,
- IEEE80211_NODE_MESH_OPENSNT = 1, /* open frame received */
- IEEE80211_NODE_MESH_OPENRCV = 2, /* open frame sent */
- IEEE80211_NODE_MESH_CONFIRMRECV = 3, /* confirm Frame recvived */
+ IEEE80211_NODE_MESH_OPENSNT = 1, /* open frame sent */
+ IEEE80211_NODE_MESH_OPENRCV = 2, /* open frame received */
+ IEEE80211_NODE_MESH_CONFIRMRCV = 3, /* confirm frame received */
IEEE80211_NODE_MESH_ESTABLISHED = 4, /* link established */
IEEE80211_NODE_MESH_HOLDING = 5, /* link closing */
};
More information about the svn-src-projects
mailing list