Date: Wed, 22 Aug 2012 11:38:03 +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: <CAMAY4ViG5BaK1SPXHznjmr8hv=rdWn4xyFfCEfTLxNreN6YP%2BQ@mail.gmail.com> In-Reply-To: <201208212047.50852.bschmidt@freebsd.org> References: <201207300139326668335@gmail.com> <201208201829.10554.bschmidt@freebsd.org> <CAMAY4VjxmjZ8BEdhjq1zSkxC=HgY2zG1LTJe3-zd9Xgzv=xLLw@mail.gmail.com> <201208212047.50852.bschmidt@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
2012/8/22 Bernhard Schmidt <bschmidt@freebsd.org>: > On Tuesday 21 August 2012 02:49:17 =C7=C7=B3=FE wrote: >> 2012/8/21 Bernhard Schmidt <bschmidt@freebsd.org>: >> > On Monday 20 August 2012 17:24:56 =C7=C7=B3=FE 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 >> |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> |--- 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 > > Is your source up 2 date and clean? It applies cleanly here. Check > with svn up and svn stat I guess. > > amy:sys/net80211% pwd > /home/bschmidt/src/svn/freebsd/stable/9/sys/net80211 > amy:sys/net80211% patch -p2 < ~/tmp/r231187.diff > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |Index: sys/net80211/ieee80211.h > |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > |--- sys/net80211/ieee80211.h (revision 231186) > |+++ sys/net80211/ieee80211.h (revision 231187) > -------------------------- > Patching file ieee80211.h using Plan A... > Hunk #1 succeeded at 709. > done > amy:sys/net80211% > > -- > Bernhard [11:28:00]root@x201i.pts/2 /usr/src # svn info Path: . Working Copy Root Path: /usr/src URL: svn://svn.freebsd.org/base/stable/9 Repository Root: svn://svn.freebsd.org/base Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f Revision: 239552 Node Kind: directory Schedule: normal Last Changed Author: kevlo Last Changed Rev: 239549 Last Changed Date: 2012-08-22 08:59:17 +0800 (Wed, 22 Aug 2012) [11:28:04]root@x201i.pts/2 /usr/src # svn stat [11:28:10]root@x201i.pts/2 /usr/src # svn log -r 231180:231190 ------------------------------------------------------------------------ r231188 | mav | 2012-02-08 15:30:48 +0800 (Wed, 08 Feb 2012) | 10 lines There hasn't r231186 for stable/9. The proximal version is r231188. [11:31:38]root@x201i.pts/2 /usr/src #svn up -r r231188 ...... Updated to revision 231188. [11:31:57]root@x201i.pts/2 /usr/src # cd sys/net80211 [11:31:59]root@x201i.pts/2 sys/net80211 # patch -p2 < /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 |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- sys/net80211/ieee80211.h (revision 231186) |+++ sys/net80211/ieee80211.h (revision 231187) -------------------------- Patching file ieee80211.h using Plan A... Hunk #1 failed at 709. 1 out of 1 hunks failed--saving rejects to ieee80211.h.rej done [11:33:43]root@x201i.pts/2 sys/net80211 # rm ieee80211.h.* remove ieee80211.h.orig? y remove ieee80211.h.rej? y [11:33:57]root@x201i.pts/2 sys/net80211 # cd /usr/src/ [11:34:09]root@x201i.pts/2 /usr/src # svn up ..... Updated to revision 239552. [11:35:46]root@x201i.pts/2 /usr/src # cd sys/net80211 [11:36:01]root@x201i.pts/2 sys/net80211 # patch -p2 < /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 |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D |--- sys/net80211/ieee80211.h (revision 231186) |+++ sys/net80211/ieee80211.h (revision 231187) -------------------------- Patching file ieee80211.h using Plan A... Hunk #1 failed at 709. 1 out of 1 hunks failed--saving rejects to ieee80211.h.rej done
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMAY4ViG5BaK1SPXHznjmr8hv=rdWn4xyFfCEfTLxNreN6YP%2BQ>