Date: Tue, 21 Aug 2012 08:49:17 +0800 From: =?UTF-8?B?5LmU5qWa?= <honestqiao@gmail.com> To: Bernhard Schmidt <bschmidt@freebsd.org> Cc: freebsd-wireless <freebsd-wireless@freebsd.org> Subject: Re: iwn0/wlan0 scan WPA2-PSK/AES as WEP on freebsd9 Message-ID: <CAMAY4VjxmjZ8BEdhjq1zSkxC=HgY2zG1LTJe3-zd9Xgzv=xLLw@mail.gmail.com> In-Reply-To: <201208201829.10554.bschmidt@freebsd.org> References: <201207300139326668335@gmail.com> <201208191814.24880.bschmidt@freebsd.org> <CAMAY4ViQvXeDXCMhH7y9YH7S2O79O=TEsA5TA-zApejnWbrRWg@mail.gmail.com> <201208201829.10554.bschmidt@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
2012/8/21 Bernhard Schmidt <bschmidt@freebsd.org>:
> On Monday 20 August 2012 17:24:56 乔楚 wrote:
>> 2012/8/20 Bernhard Schmidt <bschmidt@freebsd.org>:
>> > Can you try attached diff? This change is in head and an MFC
>> > should fix the issue.
>>
>> But my src branch is stable/9.
>>
>> I need switch to HEAD?
>
> No, the patch should apply to stable/9 just fine.
>
> --
> Bernhard
[8:48:19]root@x201i.pts/1 /usr/src # patch -p <
/home/HonestQiao/Downloads/r231187.diff
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: sys/net80211/ieee80211.h
|===================================================================
|--- sys/net80211/ieee80211.h (revision 231186)
|+++ sys/net80211/ieee80211.h (revision 231187)
--------------------------
Patching file sys/net80211/ieee80211.h using Plan A...
Hunk #1 failed at 709.
1 out of 1 hunks failed--saving rejects to sys/net80211/ieee80211.h.rej
done
[-- Attachment #2 --]
***************
*** 709,735 ****
IEEE80211_ELEMID_VENDOR = 221, /* vendor private */
/*
- * 802.11s IEs based on D3.03 spec and were not assigned by
- * ANA. Beware changing them because some of them are being
- * kept compatible with Linux.
*/
- IEEE80211_ELEMID_MESHCONF = 51,
- IEEE80211_ELEMID_MESHID = 52,
- IEEE80211_ELEMID_MESHLINK = 35,
- IEEE80211_ELEMID_MESHCNGST = 36,
- IEEE80211_ELEMID_MESHPEER = 55,
- IEEE80211_ELEMID_MESHCSA = 38,
- IEEE80211_ELEMID_MESHTIM = 39,
- IEEE80211_ELEMID_MESHAWAKEW = 40,
- IEEE80211_ELEMID_MESHBEACONT = 41,
- IEEE80211_ELEMID_MESHPANN = 48,
- IEEE80211_ELEMID_MESHRANN = 49,
- IEEE80211_ELEMID_MESHPREQ = 68,
- IEEE80211_ELEMID_MESHPREP = 69,
- IEEE80211_ELEMID_MESHPERR = 70,
- IEEE80211_ELEMID_MESHPXU = 53,
- IEEE80211_ELEMID_MESHPXUC = 54,
- IEEE80211_ELEMID_MESHAH = 60, /* Abbreviated Handshake */
};
struct ieee80211_tim_ie {
--- 709,740 ----
IEEE80211_ELEMID_VENDOR = 221, /* vendor private */
/*
+ * 802.11s IEs
+ * NB: On vanilla Linux still IEEE80211_ELEMID_MESHPEER = 55,
+ * but they defined a new with id 117 called PEER_MGMT.
+ * NB: complies with open80211
*/
+ IEEE80211_ELEMID_MESHCONF = 113,
+ IEEE80211_ELEMID_MESHID = 114,
+ IEEE80211_ELEMID_MESHLINK = 115,
+ IEEE80211_ELEMID_MESHCNGST = 116,
+ IEEE80211_ELEMID_MESHPEER = 117,
+ IEEE80211_ELEMID_MESHCSA = 118,
+ IEEE80211_ELEMID_MESHTIM = 39, /* XXX: remove */
+ IEEE80211_ELEMID_MESHAWAKEW = 119,
+ IEEE80211_ELEMID_MESHBEACONT = 120,
+ /* 121-124 MMCAOP not implemented yet */
+ IEEE80211_ELEMID_MESHPANN = 125, /* XXX: is GANN now, not used */
+ IEEE80211_ELEMID_MESHRANN = 126,
+ /* 127 Extended Capabilities */
+ /* 128-129 reserved */
+ IEEE80211_ELEMID_MESHPREQ = 130,
+ IEEE80211_ELEMID_MESHPREP = 131,
+ IEEE80211_ELEMID_MESHPERR = 132,
+ /* 133-136 reserved */
+ IEEE80211_ELEMID_MESHPXU = 137,
+ IEEE80211_ELEMID_MESHPXUC = 138,
+ IEEE80211_ELEMID_MESHAH = 60, /* XXX: remove */
};
struct ieee80211_tim_ie {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMAY4VjxmjZ8BEdhjq1zSkxC=HgY2zG1LTJe3-zd9Xgzv=xLLw>