diff options
| author | rpaulo <rpaulo@FreeBSD.org> | 2010-01-12 22:22:27 +0000 |
|---|---|---|
| committer | rpaulo <rpaulo@FreeBSD.org> | 2010-01-12 22:22:27 +0000 |
| commit | cf2c03a0f9961b5c072df009fd9a1bed000a7d06 (patch) | |
| tree | 21c842a07d7776a751c66bc9a8c3da699791a6bc /sys/net80211/ieee80211_mesh.c | |
| parent | 197dc264ae5cd82f3d8857f7df3fc372afc9e758 (diff) | |
| download | FreeBSD-src-cf2c03a0f9961b5c072df009fd9a1bed000a7d06.zip FreeBSD-src-cf2c03a0f9961b5c072df009fd9a1bed000a7d06.tar.gz | |
Update mesh code to to D4.0.
Diffstat (limited to 'sys/net80211/ieee80211_mesh.c')
| -rw-r--r-- | sys/net80211/ieee80211_mesh.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/net80211/ieee80211_mesh.c b/sys/net80211/ieee80211_mesh.c index d662269..4f3dc05 100644 --- a/sys/net80211/ieee80211_mesh.c +++ b/sys/net80211/ieee80211_mesh.c @@ -2381,6 +2381,7 @@ uint8_t * ieee80211_add_meshconf(uint8_t *frm, struct ieee80211vap *vap) { const struct ieee80211_mesh_state *ms = vap->iv_mesh; + uint16_t caps; KASSERT(vap->iv_opmode == IEEE80211_M_MBSS, ("not a MBSS vap")); @@ -2396,11 +2397,12 @@ ieee80211_add_meshconf(uint8_t *frm, struct ieee80211vap *vap) if (ms->ms_flags & IEEE80211_MESHFLAGS_PORTAL) *frm |= IEEE80211_MESHCONF_FORM_MP; frm += 1; - *frm = 0; + caps = 0; if (ms->ms_flags & IEEE80211_MESHFLAGS_AP) - *frm |= IEEE80211_MESHCONF_CAP_AP; + caps |= IEEE80211_MESHCONF_CAP_AP; if (ms->ms_flags & IEEE80211_MESHFLAGS_FWD) - *frm |= IEEE80211_MESHCONF_CAP_FWRD; + caps |= IEEE80211_MESHCONF_CAP_FWRD; + ADDSHORT(frm, caps); frm += 1; return frm; } |
