From owner-svn-src-head@FreeBSD.ORG Thu Mar 26 19:13:12 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73B5D106566B; Thu, 26 Mar 2009 19:13:11 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7E9318FC14; Thu, 26 Mar 2009 19:13:11 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2QJDBp6030456; Thu, 26 Mar 2009 19:13:11 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2QJDBTe030452; Thu, 26 Mar 2009 19:13:11 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200903261913.n2QJDBTe030452@svn.freebsd.org> From: Sam Leffler Date: Thu, 26 Mar 2009 19:13:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190451 - head/sys/net80211 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2009 19:13:13 -0000 Author: sam Date: Thu Mar 26 19:13:11 2009 New Revision: 190451 URL: http://svn.freebsd.org/changeset/base/190451 Log: Fix enough bits so that fast frames work again: o include ath ie in beacon frames o fix probe response check for including ath ie o add ieee80211_add_athcap shorthand for ap-side ie additions Modified: head/sys/net80211/ieee80211_output.c head/sys/net80211/ieee80211_proto.h head/sys/net80211/ieee80211_superg.c head/sys/net80211/ieee80211_superg.h Modified: head/sys/net80211/ieee80211_output.c ============================================================================== --- head/sys/net80211/ieee80211_output.c Thu Mar 26 19:07:56 2009 (r190450) +++ head/sys/net80211/ieee80211_output.c Thu Mar 26 19:13:11 2009 (r190451) @@ -1852,13 +1852,13 @@ ieee80211_send_mgmt(struct ieee80211_nod ni->ni_ies.htcap_ie[0] == IEEE80211_ELEMID_VENDOR) frm = ieee80211_add_htcap_vendor(frm, ni); #ifdef IEEE80211_SUPPORT_SUPERG - if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_F_ATHEROS)) - frm = ieee80211_add_ath(frm, + if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_F_ATHEROS)) { + frm = ieee80211_add_ath(frm, IEEE80211_ATH_CAP(vap, ni, IEEE80211_F_ATHEROS), - (vap->iv_flags & IEEE80211_F_WPA) == 0 && - ni->ni_authmode != IEEE80211_AUTH_8021X && - vap->iv_def_txkey != IEEE80211_KEYIX_NONE ? - vap->iv_def_txkey : 0x7fff); + ((vap->iv_flags & IEEE80211_F_WPA) == 0 && + ni->ni_authmode != IEEE80211_AUTH_8021X) ? + vap->iv_def_txkey : IEEE80211_KEYIX_NONE); + } #endif /* IEEE80211_SUPPORT_SUPERG */ if (vap->iv_appie_assocreq != NULL) frm = add_appie(frm, vap->iv_appie_assocreq); @@ -1934,9 +1934,11 @@ ieee80211_send_mgmt(struct ieee80211_nod } #ifdef IEEE80211_SUPPORT_SUPERG if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_F_ATHEROS)) - frm = ieee80211_add_ath(frm, + frm = ieee80211_add_ath(frm, IEEE80211_ATH_CAP(vap, ni, IEEE80211_F_ATHEROS), - ni->ni_ath_defkeyix); + ((vap->iv_flags & IEEE80211_F_WPA) == 0 && + ni->ni_authmode != IEEE80211_AUTH_8021X) ? + vap->iv_def_txkey : IEEE80211_KEYIX_NONE); #endif /* IEEE80211_SUPPORT_SUPERG */ if (vap->iv_appie_assocresp != NULL) frm = add_appie(frm, vap->iv_appie_assocresp); @@ -2124,9 +2126,9 @@ ieee80211_alloc_proberesp(struct ieee802 frm = ieee80211_add_htinfo_vendor(frm, bss); } #ifdef IEEE80211_SUPPORT_SUPERG - if (bss->ni_ies.ath_ie != NULL && legacy != IEEE80211_SEND_LEGACY_11B) - frm = ieee80211_add_ath(frm, bss->ni_ath_flags, - bss->ni_ath_defkeyix); + if ((vap->iv_flags & IEEE80211_F_ATHEROS) && + legacy != IEEE80211_SEND_LEGACY_11B) + frm = ieee80211_add_athcaps(frm, bss); #endif if (vap->iv_appie_proberesp != NULL) frm = add_appie(frm, vap->iv_appie_proberesp); @@ -2320,6 +2322,7 @@ ieee80211_beacon_construct(struct mbuf * * [tlv] WME parameters * [tlv] Vendor OUI HT capabilities (optional) * [tlv] Vendor OUI HT information (optional) + * [tlv] Atheros capabilities (optional) * [tlv] TDMA parameters (optional) * [tlv] application data (optional) */ @@ -2410,6 +2413,12 @@ ieee80211_beacon_construct(struct mbuf * frm = ieee80211_add_htcap_vendor(frm, ni); frm = ieee80211_add_htinfo_vendor(frm, ni); } +#ifdef IEEE80211_SUPPORT_SUPERG + if (vap->iv_flags & IEEE80211_F_ATHEROS) { + bo->bo_ath = frm; + frm = ieee80211_add_athcaps(frm, ni); + } +#endif #ifdef IEEE80211_SUPPORT_TDMA if (vap->iv_caps & IEEE80211_C_TDMA) { bo->bo_tdma = frm; @@ -2489,6 +2498,9 @@ ieee80211_beacon_alloc(struct ieee80211_ + 4+2*sizeof(struct ieee80211_ie_htinfo)/* HT info */ + (vap->iv_caps & IEEE80211_C_WME ? /* WME */ sizeof(struct ieee80211_wme_param) : 0) +#ifdef IEEE80211_SUPPORT_SUPERG + + sizeof(struct ieee80211_ath_ie) /* ATH */ +#endif #ifdef IEEE80211_SUPPORT_TDMA + (vap->iv_caps & IEEE80211_C_TDMA ? /* TDMA */ sizeof(struct ieee80211_tdma_param) : 0) @@ -2666,6 +2678,9 @@ ieee80211_beacon_update(struct ieee80211 bo->bo_tim_trailer += adjust; bo->bo_erp += adjust; bo->bo_htinfo += adjust; +#ifdef IEEE80211_SUPERG_SUPPORT + bo->bo_ath += adjust; +#endif #ifdef IEEE80211_TDMA_SUPPORT bo->bo_tdma += adjust; #endif @@ -2714,6 +2729,9 @@ ieee80211_beacon_update(struct ieee80211 bo->bo_erp += sizeof(*csa); bo->bo_htinfo += sizeof(*csa); bo->bo_wme += sizeof(*csa); +#ifdef IEEE80211_SUPERG_SUPPORT + bo->bo_ath += sizeof(*csa); +#endif #ifdef IEEE80211_TDMA_SUPPORT bo->bo_tdma += sizeof(*csa); #endif @@ -2736,6 +2754,12 @@ ieee80211_beacon_update(struct ieee80211 (void) ieee80211_add_erp(bo->bo_erp, ic); clrbit(bo->bo_flags, IEEE80211_BEACON_ERP); } +#ifdef IEEE80211_SUPPORT_SUPERG + if (isset(bo->bo_flags, IEEE80211_BEACON_ATH)) { + ieee80211_add_athcaps(bo->bo_ath, ni); + clrbit(bo->bo_flags, IEEE80211_BEACON_ATH); + } +#endif } if (isset(bo->bo_flags, IEEE80211_BEACON_APPIE)) { const struct ieee80211_appie *aie = vap->iv_appie_beacon; Modified: head/sys/net80211/ieee80211_proto.h ============================================================================== --- head/sys/net80211/ieee80211_proto.h Thu Mar 26 19:07:56 2009 (r190450) +++ head/sys/net80211/ieee80211_proto.h Thu Mar 26 19:13:11 2009 (r190451) @@ -300,6 +300,7 @@ struct ieee80211_beacon_offsets { uint16_t bo_tim_trailer_len;/* tim trailer length in bytes */ uint8_t *bo_erp; /* start of ERP element */ uint8_t *bo_htinfo; /* start of HT info element */ + uint8_t *bo_ath; /* start of ATH parameters */ uint8_t *bo_appie; /* start of AppIE element */ uint16_t bo_appie_len; /* AppIE length in bytes */ uint16_t bo_csa_trailer_len;; @@ -330,6 +331,7 @@ enum { IEEE80211_BEACON_CFP = 6, /* CFParms */ IEEE80211_BEACON_CSA = 7, /* Channel Switch Announcement */ IEEE80211_BEACON_TDMA = 9, /* TDMA Info */ + IEEE80211_BEACON_ATH = 10, /* ATH parameters */ }; int ieee80211_beacon_update(struct ieee80211_node *, struct ieee80211_beacon_offsets *, struct mbuf *, int mcast); Modified: head/sys/net80211/ieee80211_superg.c ============================================================================== --- head/sys/net80211/ieee80211_superg.c Thu Mar 26 19:07:56 2009 (r190450) +++ head/sys/net80211/ieee80211_superg.c Thu Mar 26 19:13:11 2009 (r190451) @@ -81,7 +81,7 @@ ieee80211_superg_vdetach(struct ieee8021 * Add a WME information element to a frame. */ uint8_t * -ieee80211_add_ath(uint8_t *frm, uint8_t caps, uint16_t defkeyix) +ieee80211_add_ath(uint8_t *frm, uint8_t caps, ieee80211_keyix defkeyix) { static const struct ieee80211_ath_ie info = { .ath_id = IEEE80211_ELEMID_VENDOR, @@ -95,12 +95,29 @@ ieee80211_add_ath(uint8_t *frm, uint8_t memcpy(frm, &info, sizeof(info)); ath->ath_capability = caps; - ath->ath_defkeyix[0] = (defkeyix & 0xff); - ath->ath_defkeyix[1] = ((defkeyix >> 8) & 0xff); + if (defkeyix != IEEE80211_KEYIX_NONE) { + ath->ath_defkeyix[0] = (defkeyix & 0xff); + ath->ath_defkeyix[1] = ((defkeyix >> 8) & 0xff); + } else { + ath->ath_defkeyix[0] = 0xff; + ath->ath_defkeyix[1] = 0x7f; + } return frm + sizeof(info); } #undef ATH_OUI_BYTES +uint8_t * +ieee80211_add_athcaps(uint8_t *frm, const struct ieee80211_node *bss) +{ + const struct ieee80211vap *vap = bss->ni_vap; + + return ieee80211_add_ath(frm, + vap->iv_flags & IEEE80211_F_ATHEROS, + ((vap->iv_flags & IEEE80211_F_WPA) == 0 && + bss->ni_authmode != IEEE80211_AUTH_8021X) ? + vap->iv_def_txkey : IEEE80211_KEYIX_NONE); +} + void ieee80211_parse_ath(struct ieee80211_node *ni, uint8_t *ie) { Modified: head/sys/net80211/ieee80211_superg.h ============================================================================== --- head/sys/net80211/ieee80211_superg.h Thu Mar 26 19:07:56 2009 (r190450) +++ head/sys/net80211/ieee80211_superg.h Thu Mar 26 19:13:11 2009 (r190451) @@ -36,7 +36,8 @@ void ieee80211_superg_detach(struct ieee void ieee80211_superg_vattach(struct ieee80211vap *); void ieee80211_superg_vdetach(struct ieee80211vap *); -uint8_t *ieee80211_add_ath(uint8_t *frm, uint8_t caps, uint16_t defkeyix); +uint8_t *ieee80211_add_ath(uint8_t *, uint8_t, ieee80211_keyix); +uint8_t *ieee80211_add_athcaps(uint8_t *, const struct ieee80211_node *); void ieee80211_parse_ath(struct ieee80211_node *, uint8_t *); int ieee80211_parse_athparams(struct ieee80211_node *, uint8_t *, const struct ieee80211_frame *);