|
Lines 2322-2339
Link Here
|
| 2322 |
ic->ic_curchan); |
2322 |
ic->ic_curchan); |
| 2323 |
frm = ieee80211_add_supportedchannels(frm, ic); |
2323 |
frm = ieee80211_add_supportedchannels(frm, ic); |
| 2324 |
} |
2324 |
} |
|
|
2325 |
|
| 2326 |
/* |
| 2327 |
* Check the channel - we may be using an 11n NIC with an |
| 2328 |
* 11n capable station, but we're configured to be an 11b |
| 2329 |
* channel. |
| 2330 |
*/ |
| 2325 |
if ((vap->iv_flags_ht & IEEE80211_FHT_HT) && |
2331 |
if ((vap->iv_flags_ht & IEEE80211_FHT_HT) && |
|
|
2332 |
IEEE80211_IS_CHAN_HT(ni->ni_chan) && |
| 2326 |
ni->ni_ies.htcap_ie != NULL && |
2333 |
ni->ni_ies.htcap_ie != NULL && |
| 2327 |
ni->ni_ies.htcap_ie[0] == IEEE80211_ELEMID_HTCAP) |
2334 |
ni->ni_ies.htcap_ie[0] == IEEE80211_ELEMID_HTCAP) { |
| 2328 |
frm = ieee80211_add_htcap(frm, ni); |
2335 |
frm = ieee80211_add_htcap(frm, ni); |
|
|
2336 |
} |
| 2329 |
frm = ieee80211_add_wpa(frm, vap); |
2337 |
frm = ieee80211_add_wpa(frm, vap); |
| 2330 |
if ((ic->ic_flags & IEEE80211_F_WME) && |
2338 |
if ((ic->ic_flags & IEEE80211_F_WME) && |
| 2331 |
ni->ni_ies.wme_ie != NULL) |
2339 |
ni->ni_ies.wme_ie != NULL) |
| 2332 |
frm = ieee80211_add_wme_info(frm, &ic->ic_wme); |
2340 |
frm = ieee80211_add_wme_info(frm, &ic->ic_wme); |
|
|
2341 |
|
| 2342 |
/* |
| 2343 |
* Same deal - only send HT info if we're on an 11n |
| 2344 |
* capable channel. |
| 2345 |
*/ |
| 2333 |
if ((vap->iv_flags_ht & IEEE80211_FHT_HT) && |
2346 |
if ((vap->iv_flags_ht & IEEE80211_FHT_HT) && |
|
|
2347 |
IEEE80211_IS_CHAN_HT(ni->ni_chan) && |
| 2334 |
ni->ni_ies.htcap_ie != NULL && |
2348 |
ni->ni_ies.htcap_ie != NULL && |
| 2335 |
ni->ni_ies.htcap_ie[0] == IEEE80211_ELEMID_VENDOR) |
2349 |
ni->ni_ies.htcap_ie[0] == IEEE80211_ELEMID_VENDOR) { |
| 2336 |
frm = ieee80211_add_htcap_vendor(frm, ni); |
2350 |
frm = ieee80211_add_htcap_vendor(frm, ni); |
|
|
2351 |
} |
| 2337 |
#ifdef IEEE80211_SUPPORT_SUPERG |
2352 |
#ifdef IEEE80211_SUPPORT_SUPERG |
| 2338 |
if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_F_ATHEROS)) { |
2353 |
if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_F_ATHEROS)) { |
| 2339 |
frm = ieee80211_add_ath(frm, |
2354 |
frm = ieee80211_add_ath(frm, |