Changeset 2367

Timestamp:

05/24/07 18:45:07 (2 years ago)

Author:

mentor

Message:

Fix the filling of Atheros XR IEs, as per #1344. The patch has been modified to change the way the OUI type, suybtype and ver fields are assigned.

Signed-off-by: Md Sohail Ahmad <md.ahmad@airtightnetworks.net>

Files:

• trunk/net80211/ieee80211.h (modified) (3 diffs)
• trunk/net80211/ieee80211_output.c (modified) (4 diffs)

trunk/net80211/ieee80211.h

@@ -515 +515 @@
-        u_int8_t athAdvCap_len;         /* length in bytes */
-        u_int8_t athAdvCap_oui[3];      /* 0x00, 0x03, 0x7f */
-       
+
-        u_int8_t athAdvCap_subtype;     /* OUI subtype */
-        u_int8_t athAdvCap_version;     /* spec revision */
@@ -663 +663 @@
-        u_int16_t wpa_caps;             /* 802.11i capabilities */
-        u_int16_t wpa_pmkidcnt;         /* 802.11i pmkid count */
-       
+
-} __packed;
-
@@ -747 +747 @@
-#define ATH_OUI_TYPE            0x01
-#define ATH_OUI_SUBTYPE         0x01
- 
+        
-#define ATH_OUI_TYPE_XR         0x03
-
+
+
-
-#define WPA_OUI                 0xf25000

trunk/net80211/ieee80211_output.c

@@ -1588 +1588 @@
-{
-        static const u_int8_t oui[6] = {(ATH_OUI & 0xff), ((ATH_OUI >>8) & 0xff),
-
-
+                       
+                       
-        struct ieee80211_ie_athAdvCap *ie = (struct ieee80211_ie_athAdvCap *) frm;
-
@@ -1613 +1613 @@
-ieee80211_add_xr_param(u_int8_t *frm,struct ieee80211vap *vap)
-{
-
-
+
+
+
-        struct ieee80211_xr_param *ie = (struct ieee80211_xr_param *) frm;
-
@@ -1621 +1622 @@
-        memcpy(frm, oui, sizeof(oui));          /* Atheros OUI, type, subtype, and version for adv capabilities */
-        frm += sizeof(oui);
-
-
-
-
-
+
-
-        /* copy the BSSIDs */
-        if (vap->iv_flags & IEEE80211_F_XR) {
-
+     /* Base BSSID */
-                frm += IEEE80211_ADDR_LEN;
-
+               /* XR BSSID */
-                frm += IEEE80211_ADDR_LEN;
-xrvap->iv_bss->ni_intval);
+bss->ni_intval);              /* XR beacon interval */
-                frm += 2;
-
-
-
-
+
+
-        } else {
-                IEEE80211_ADDR_COPY(frm, vap->iv_bss->ni_bssid);
@@ -1645 +1640 @@
-                frm += IEEE80211_ADDR_LEN;
-                *(__le16 *)frm = htole16(vap->iv_bss->ni_intval);
-                frm += 2;
-                *(__le16 *)frm = htole16(vap->iv_xrvap->iv_bss->ni_intval);
-                frm += 2;
-                *frm++ = vap->iv_ath_cap;