28c28
< __FBSDID("$FreeBSD: head/sys/net80211/ieee80211_output.c 253007 2013-07-07 21:39:37Z alfred $");
---
> __FBSDID("$FreeBSD: head/sys/net80211/ieee80211_output.c 253639 2013-07-25 06:23:26Z rpaulo $");
1885a1886,1919
> uint8_t *
> ieee80211_add_wpa(uint8_t *frm, const struct ieee80211vap *vap)
> {
> if (vap->iv_flags & IEEE80211_F_WPA1 && vap->iv_wpa_ie != NULL)
> return (add_ie(frm, vap->iv_wpa_ie));
> else {
> /* XXX else complain? */
> return (frm);
> }
> }
>
> uint8_t *
> ieee80211_add_rsn(uint8_t *frm, const struct ieee80211vap *vap)
> {
> if (vap->iv_flags & IEEE80211_F_WPA2 && vap->iv_rsn_ie != NULL)
> return (add_ie(frm, vap->iv_rsn_ie));
> else {
> /* XXX else complain? */
> return (frm);
> }
> }
>
> uint8_t *
> ieee80211_add_qos(uint8_t *frm, const struct ieee80211_node *ni)
> {
> if (ni->ni_flags & IEEE80211_NODE_QOS) {
> *frm++ = IEEE80211_ELEMID_QOS;
> *frm++ = 1;
> *frm++ = 0;
> }
>
> return (frm);
> }
>
1954,1958c1988
< if (vap->iv_flags & IEEE80211_F_WPA2) {
< if (vap->iv_rsn_ie != NULL)
< frm = add_ie(frm, vap->iv_rsn_ie);
< /* XXX else complain? */
< }
---
> frm = ieee80211_add_rsn(frm, vap);
1960,1964c1990
< if (vap->iv_flags & IEEE80211_F_WPA1) {
< if (vap->iv_wpa_ie != NULL)
< frm = add_ie(frm, vap->iv_wpa_ie);
< /* XXX else complain? */
< }
---
> frm = ieee80211_add_wpa(frm, vap);
2230,2234c2256
< if (vap->iv_flags & IEEE80211_F_WPA2) {
< if (vap->iv_rsn_ie != NULL)
< frm = add_ie(frm, vap->iv_rsn_ie);
< /* XXX else complain? */
< }
---
> frm = ieee80211_add_rsn(frm, vap);
2245,2249c2267
< if (vap->iv_flags & IEEE80211_F_WPA1) {
< if (vap->iv_wpa_ie != NULL)
< frm = add_ie(frm, vap->iv_wpa_ie);
< /* XXX else complain */
< }
---
> frm = ieee80211_add_wpa(frm, vap);
2516,2520c2534
< if (vap->iv_flags & IEEE80211_F_WPA2) {
< if (vap->iv_rsn_ie != NULL)
< frm = add_ie(frm, vap->iv_rsn_ie);
< /* XXX else complain? */
< }
---
> frm = ieee80211_add_rsn(frm, vap);
2532,2536c2546
< if (vap->iv_flags & IEEE80211_F_WPA1) {
< if (vap->iv_wpa_ie != NULL)
< frm = add_ie(frm, vap->iv_wpa_ie);
< /* XXX else complain? */
< }
---
> frm = ieee80211_add_wpa(frm, vap);
2834,2838c2844
< if (vap->iv_flags & IEEE80211_F_WPA2) {
< if (vap->iv_rsn_ie != NULL)
< frm = add_ie(frm, vap->iv_rsn_ie);
< /* XXX else complain */
< }
---
> frm = ieee80211_add_rsn(frm, vap);
2844,2848c2850
< if (vap->iv_flags & IEEE80211_F_WPA1) {
< if (vap->iv_wpa_ie != NULL)
< frm = add_ie(frm, vap->iv_wpa_ie);
< /* XXX else complain */
< }
---
> frm = ieee80211_add_wpa(frm, vap);