Ticket #698: agere-assoc-698.diff

net80211/ieee80211.h

@@ -667 +667 @@
-        IEEE80211_ELEMID_ERP            = 42,
-        IEEE80211_ELEMID_RSN            = 48,
-        IEEE80211_ELEMID_XRATES         = 50,
+        /* 128-129 proprietary elements used by Agere chipsets */
+        IEEE80211_ELEMID_AGERE1         = 128,
+        IEEE80211_ELEMID_AGERE2         = 129,
-        IEEE80211_ELEMID_TPC            = 150,
-        IEEE80211_ELEMID_CCKM           = 156,
-        IEEE80211_ELEMID_VENDOR         = 221,  /* vendor private */

net80211/ieee80211_input.c

@@ -2426 +2426 @@
-                scan.chan = scan.bchan;
-
-                while (frm < efrm) {
+                        /* Agere element in beacon */
+                        if ((*frm == IEEE80211_ELEMID_AGERE1) ||
+                            (*frm == IEEE80211_ELEMID_AGERE2)) {
+                                frm = efrm;
+                                continue;
+                        }
+
-                        IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1]);
-                        switch (*frm) {
-                        case IEEE80211_ELEMID_SSID:
@@ -3203 +3210 @@
-
-                rates = xrates = wme = NULL;
-                while (frm < efrm) {
+                        /* 
+                         * Do not discard frames containing proprietary Agere
+                         * elements 128 and 129, as the reported element length
+                         * is often wrong. Skip rest of the frame, since we can
+                         * not rely on the given element length making it impossible
+                         * to know where the next element starts.
+                         */
+                        if ((*frm == IEEE80211_ELEMID_AGERE1) ||
+                            (*frm == IEEE80211_ELEMID_AGERE2)) {
+                                frm = efrm;
+                                continue;
+                        }
+
-                        IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1]);
-                        switch (*frm) {
-                        case IEEE80211_ELEMID_RATES:

THANKS

@@ -105 +105 @@
-Tony Espy
-Joerg Albert
-Oliver Stampfli
+Till Wollenberg
-
-Apologies to anyone whose name was unintentionally left off.
-Please let us know if you think your name should be mentioned here!