Ticket #1344: patch-xr-element-fill-fix.diff
| File patch-xr-element-fill-fix.diff, 2.4 kB (added by md.ahmad@airtightnetworks.net, 5 years ago) |
|---|
-
madwifi-0.9.3.1/net80211/ieee80211.h
old new 748 748 #define ATH_OUI_SUBTYPE 0x01 749 749 #define ATH_OUI_VERSION 0x00 750 750 #define ATH_OUI_TYPE_XR 0x03 751 #define ATH_OUI_VER_XR 0x01 751 #define ATH_OUI_SUTYPE_XR 0x01 752 #define ATH_OUI_VER_XR 0x00 752 753 753 754 #define WPA_OUI 0xf25000 754 755 #define WPA_OUI_TYPE 0x01 -
madwifi-0.9.3.1/net80211/ieee80211_output.c
old new 1619 1619 1620 1620 *frm++ = IEEE80211_ELEMID_VENDOR; 1621 1621 *frm++ = 0; /* Length filled in below */ 1622 memcpy(frm, oui, sizeof(oui)); /* Atheros OUI , type, subtype, and version for adv capabilities*/1622 memcpy(frm, oui, sizeof(oui)); /* Atheros OUI */ 1623 1623 frm += sizeof(oui); 1624 *frm++ = ATH_OUI_TYPE_XR; 1625 *frm++ = ATH_OUI_VER_XR; 1626 *frm++ = 0; 1627 *frm++ = 0; 1628 *frm++ = 0; 1624 *frm++ = ATH_OUI_TYPE_XR; /*XR type*/ 1625 *frm++ = ATH_OUI_SUBTYPE_XR; /*XR subtype*/ 1626 *frm++ = ATH_OUI_VER_XR; /*XR version*/ 1627 *frm++ = 0; /*XR info*/ 1629 1628 1630 1629 /* copy the BSSIDs */ 1631 1630 if (vap->iv_flags & IEEE80211_F_XR) { 1632 IEEE80211_ADDR_COPY(frm, vap->iv_xrvap->iv_bss->ni_bssid); 1631 IEEE80211_ADDR_COPY(frm, vap->iv_xrvap->iv_bss->ni_bssid); /*Base BSSID*/ 1633 1632 frm += IEEE80211_ADDR_LEN; 1634 IEEE80211_ADDR_COPY(frm, vap->iv_bss->ni_bssid); 1633 IEEE80211_ADDR_COPY(frm, vap->iv_bss->ni_bssid); /*XR BSSID*/ 1635 1634 frm += IEEE80211_ADDR_LEN; 1636 *(__le16 *)frm = htole16(vap->iv_ xrvap->iv_bss->ni_intval);1635 *(__le16 *)frm = htole16(vap->iv_bss->ni_intval); /*XR beacon interval*/ 1637 1636 frm += 2; 1638 *(__le16 *)frm = htole16(vap->iv_bss->ni_intval); 1639 frm += 2; 1640 *frm++ = vap->iv_xrvap->iv_ath_cap; 1641 *frm++ = vap->iv_ath_cap; 1637 *frm++ = vap->iv_xrvap->iv_ath_cap; /*Base mode capability*/ 1638 *frm++ = vap->iv_ath_cap; /*XR mode capability*/ 1642 1639 } else { 1643 1640 IEEE80211_ADDR_COPY(frm, vap->iv_bss->ni_bssid); 1644 1641 frm += IEEE80211_ADDR_LEN; … … 1646 1643 frm += IEEE80211_ADDR_LEN; 1647 1644 *(__le16 *)frm = htole16(vap->iv_bss->ni_intval); 1648 1645 frm += 2; 1649 *(__le16 *)frm = htole16(vap->iv_xrvap->iv_bss->ni_intval);1650 frm += 2;1651 1646 *frm++ = vap->iv_ath_cap; 1652 1647 *frm++ = vap->iv_xrvap->iv_ath_cap; 1653 1648 }
