diff options
| author | adrian <adrian@FreeBSD.org> | 2012-03-04 05:49:39 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2012-03-04 05:49:39 +0000 |
| commit | 8d7335fa92b63c3acd810fb4432ac1d312739f25 (patch) | |
| tree | a5fc6ce807c0d87dbd87d4f0b33c75c01fdb8b0d /sys/net80211/ieee80211_hwmp.c | |
| parent | 77002eeb6cfd162e6ae4999ec8029a1079f7344f (diff) | |
| download | FreeBSD-src-8d7335fa92b63c3acd810fb4432ac1d312739f25.zip FreeBSD-src-8d7335fa92b63c3acd810fb4432ac1d312739f25.tar.gz | |
* Added IEEE80211_ACTION_CAT_MESH in ieee80211.h as specified amendment spec;
* Moved old categories as specified by D4.0 to be action fields of MESH category
as specified in amendment spec;
* Modified functions to use MESH category and its action fields:
+ ieee80211_send_action_register
+ ieee80211_send_action
+ ieee80211_recv_action_register
+ieee80211_recv_action;
* Modified ieee80211_hwmp_init and hwmp_send_action so they uses correct
action fields as specified in amendment spec;
* Modified ieee80211_parse_action so that it verifies MESH frames.
* Change Mesh Link Metric to use one information element as amendment spec.
Draft 4.0 defined two different information elements for request and response.
Submitted by: monthadar@gmail.com
Diffstat (limited to 'sys/net80211/ieee80211_hwmp.c')
| -rw-r--r-- | sys/net80211/ieee80211_hwmp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/net80211/ieee80211_hwmp.c b/sys/net80211/ieee80211_hwmp.c index 319c862..d084c5f 100644 --- a/sys/net80211/ieee80211_hwmp.c +++ b/sys/net80211/ieee80211_hwmp.c @@ -220,8 +220,8 @@ ieee80211_hwmp_init(void) /* * Register action frame handler. */ - ieee80211_recv_action_register(IEEE80211_ACTION_CAT_MESHPATH, - IEEE80211_ACTION_MESHPATH_SEL, hwmp_recv_action_meshpath); + ieee80211_recv_action_register(IEEE80211_ACTION_CAT_MESH, + IEEE80211_ACTION_MESH_HWMP, hwmp_recv_action_meshpath); /* NB: default is 5 secs per spec */ mesh_proto_hwmp.mpp_inact = msecs_to_ticks(5*1000); @@ -434,8 +434,8 @@ hwmp_send_action(struct ieee80211_node *ni, vap->iv_stats.is_tx_nobuf++; return ENOMEM; } - *frm++ = IEEE80211_ACTION_CAT_MESHPATH; - *frm++ = IEEE80211_ACTION_MESHPATH_SEL; + *frm++ = IEEE80211_ACTION_CAT_MESH; + *frm++ = IEEE80211_ACTION_MESH_HWMP; switch (*ie) { case IEEE80211_ELEMID_MESHPREQ: frm = hwmp_add_meshpreq(frm, |
