Re: Please pull 'libertas' branch of wireless-2.6

Re: Please pull 'libertas' branch of wireless-2.6

[John W. Linville]

Ugh...original was too big...

Patches are available here:

	http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/libertas/

Thanks,

John

On Tue, Feb 27, 2007 at 03:56:49PM -0500, John W. Linville wrote:
> Here is the libertas wireless driver for OLPC.  It has been beaten into
> shape by a couple of review rounds on netdev and is now mostly good.
> I'm sure Marcelo isn't going anywhere... :-)
> 
> This also includes a fixup patch from me to account for the recent
> netdev class_device -> device changes.  You probably want Marcelo to
> bless it before you pull into the upstream branch of netdev-2.6.
> 
> Thanks,
> 
> John
> 
> ---
> 
> The following changes since commit c8f71b01a50597e298dc3214a2f2be7b8d31170c:
>   Linus Torvalds (1):
>         Linux 2.6.21-rc1
> 
> are found in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git libertas
> 
> John W. Linville (1):
>       libertas: fix build breakage from netdev class_device -> device
> 
> Marcelo Tosatti (1):
>       Marvell Libertas 8388 802.11b/g USB driver
> 
>  drivers/net/wireless/Kconfig               |   13 +
>  drivers/net/wireless/Makefile              |    1 +
>  drivers/net/wireless/libertas/11d.c        |  754 ++++++++
>  drivers/net/wireless/libertas/11d.h        |  105 ++
>  drivers/net/wireless/libertas/LICENSE      |   16 +
>  drivers/net/wireless/libertas/Makefile     |   21 +
>  drivers/net/wireless/libertas/README       | 1044 +++++++++++
>  drivers/net/wireless/libertas/assoc.c      |  588 ++++++
>  drivers/net/wireless/libertas/assoc.h      |   30 +
>  drivers/net/wireless/libertas/cmd.c        | 1958 ++++++++++++++++++++
>  drivers/net/wireless/libertas/cmdresp.c    | 1031 +++++++++++
>  drivers/net/wireless/libertas/debugfs.c    | 1968 ++++++++++++++++++++
>  drivers/net/wireless/libertas/debugfs.h    |    6 +
>  drivers/net/wireless/libertas/decl.h       |   83 +
>  drivers/net/wireless/libertas/defs.h       |  369 ++++
>  drivers/net/wireless/libertas/dev.h        |  403 ++++
>  drivers/net/wireless/libertas/ethtool.c    |  184 ++
>  drivers/net/wireless/libertas/fw.c         |  361 ++++
>  drivers/net/wireless/libertas/fw.h         |   13 +
>  drivers/net/wireless/libertas/host.h       |  338 ++++
>  drivers/net/wireless/libertas/hostcmd.h    |  693 +++++++
>  drivers/net/wireless/libertas/if_bootcmd.c |   38 +
>  drivers/net/wireless/libertas/if_usb.c     |  952 ++++++++++
>  drivers/net/wireless/libertas/if_usb.h     |  109 ++
>  drivers/net/wireless/libertas/ioctl.c      | 2500 +++++++++++++++++++++++++
>  drivers/net/wireless/libertas/join.c       | 1055 +++++++++++
>  drivers/net/wireless/libertas/join.h       |   64 +
>  drivers/net/wireless/libertas/main.c       | 1258 +++++++++++++
>  drivers/net/wireless/libertas/radiotap.h   |   57 +
>  drivers/net/wireless/libertas/rx.c         |  459 +++++
>  drivers/net/wireless/libertas/sbi.h        |   40 +
>  drivers/net/wireless/libertas/scan.c       | 2044 ++++++++++++++++++++
>  drivers/net/wireless/libertas/scan.h       |  216 +++
>  drivers/net/wireless/libertas/thread.h     |   52 +
>  drivers/net/wireless/libertas/tx.c         |  285 +++
>  drivers/net/wireless/libertas/types.h      |  289 +++
>  drivers/net/wireless/libertas/version.h    |    8 +
>  drivers/net/wireless/libertas/wext.c       | 2769 ++++++++++++++++++++++++++++
>  drivers/net/wireless/libertas/wext.h       |  147 ++
>  include/net/ieee80211_radiotap.h           |   31 +-
>  40 files changed, 22351 insertions(+), 1 deletions(-)
>  create mode 100644 drivers/net/wireless/libertas/11d.c
>  create mode 100644 drivers/net/wireless/libertas/11d.h
>  create mode 100644 drivers/net/wireless/libertas/LICENSE
>  create mode 100644 drivers/net/wireless/libertas/Makefile
>  create mode 100644 drivers/net/wireless/libertas/README
>  create mode 100644 drivers/net/wireless/libertas/assoc.c
>  create mode 100644 drivers/net/wireless/libertas/assoc.h
>  create mode 100644 drivers/net/wireless/libertas/cmd.c
>  create mode 100644 drivers/net/wireless/libertas/cmdresp.c
>  create mode 100644 drivers/net/wireless/libertas/debugfs.c
>  create mode 100644 drivers/net/wireless/libertas/debugfs.h
>  create mode 100644 drivers/net/wireless/libertas/decl.h
>  create mode 100644 drivers/net/wireless/libertas/defs.h
>  create mode 100644 drivers/net/wireless/libertas/dev.h
>  create mode 100644 drivers/net/wireless/libertas/ethtool.c
>  create mode 100644 drivers/net/wireless/libertas/fw.c
>  create mode 100644 drivers/net/wireless/libertas/fw.h
>  create mode 100644 drivers/net/wireless/libertas/host.h
>  create mode 100644 drivers/net/wireless/libertas/hostcmd.h
>  create mode 100644 drivers/net/wireless/libertas/if_bootcmd.c
>  create mode 100644 drivers/net/wireless/libertas/if_usb.c
>  create mode 100644 drivers/net/wireless/libertas/if_usb.h
>  create mode 100644 drivers/net/wireless/libertas/ioctl.c
>  create mode 100644 drivers/net/wireless/libertas/join.c
>  create mode 100644 drivers/net/wireless/libertas/join.h
>  create mode 100644 drivers/net/wireless/libertas/main.c
>  create mode 100644 drivers/net/wireless/libertas/radiotap.h
>  create mode 100644 drivers/net/wireless/libertas/rx.c
>  create mode 100644 drivers/net/wireless/libertas/sbi.h
>  create mode 100644 drivers/net/wireless/libertas/scan.c
>  create mode 100644 drivers/net/wireless/libertas/scan.h
>  create mode 100644 drivers/net/wireless/libertas/thread.h
>  create mode 100644 drivers/net/wireless/libertas/tx.c
>  create mode 100644 drivers/net/wireless/libertas/types.h
>  create mode 100644 drivers/net/wireless/libertas/version.h
>  create mode 100644 drivers/net/wireless/libertas/wext.c
>  create mode 100644 drivers/net/wireless/libertas/wext.h

-- 
John W. Linville
linville@tuxdriver.com

Re: Please pull 'libertas' branch of wireless-2.6

[Jeff Garzik]

John W. Linville wrote:
> Here is the libertas wireless driver for OLPC.  It has been beaten into
> shape by a couple of review rounds on netdev and is now mostly good.
> I'm sure Marcelo isn't going anywhere... :-)
> 
> This also includes a fixup patch from me to account for the recent
> netdev class_device -> device changes.  You probably want Marcelo to
> bless it before you pull into the upstream branch of netdev-2.6.
> 
> Thanks,
> 
> John
> 
> ---
> 
> The following changes since commit c8f71b01a50597e298dc3214a2f2be7b8d31170c:
>   Linus Torvalds (1):
>         Linux 2.6.21-rc1
> 
> are found in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git libertas
> 
> John W. Linville (1):
>       libertas: fix build breakage from netdev class_device -> device
> 
> Marcelo Tosatti (1):
>       Marvell Libertas 8388 802.11b/g USB driver
> 
>  drivers/net/wireless/Kconfig               |   13 +
>  drivers/net/wireless/Makefile              |    1 +
>  drivers/net/wireless/libertas/11d.c        |  754 ++++++++
>  drivers/net/wireless/libertas/11d.h        |  105 ++
>  drivers/net/wireless/libertas/LICENSE      |   16 +
>  drivers/net/wireless/libertas/Makefile     |   21 +
>  drivers/net/wireless/libertas/README       | 1044 +++++++++++
>  drivers/net/wireless/libertas/assoc.c      |  588 ++++++
>  drivers/net/wireless/libertas/assoc.h      |   30 +
>  drivers/net/wireless/libertas/cmd.c        | 1958 ++++++++++++++++++++
>  drivers/net/wireless/libertas/cmdresp.c    | 1031 +++++++++++
>  drivers/net/wireless/libertas/debugfs.c    | 1968 ++++++++++++++++++++
>  drivers/net/wireless/libertas/debugfs.h    |    6 +
>  drivers/net/wireless/libertas/decl.h       |   83 +
>  drivers/net/wireless/libertas/defs.h       |  369 ++++
>  drivers/net/wireless/libertas/dev.h        |  403 ++++
>  drivers/net/wireless/libertas/ethtool.c    |  184 ++
>  drivers/net/wireless/libertas/fw.c         |  361 ++++
>  drivers/net/wireless/libertas/fw.h         |   13 +
>  drivers/net/wireless/libertas/host.h       |  338 ++++
>  drivers/net/wireless/libertas/hostcmd.h    |  693 +++++++
>  drivers/net/wireless/libertas/if_bootcmd.c |   38 +
>  drivers/net/wireless/libertas/if_usb.c     |  952 ++++++++++
>  drivers/net/wireless/libertas/if_usb.h     |  109 ++
>  drivers/net/wireless/libertas/ioctl.c      | 2500 +++++++++++++++++++++++++
>  drivers/net/wireless/libertas/join.c       | 1055 +++++++++++
>  drivers/net/wireless/libertas/join.h       |   64 +
>  drivers/net/wireless/libertas/main.c       | 1258 +++++++++++++
>  drivers/net/wireless/libertas/radiotap.h   |   57 +
>  drivers/net/wireless/libertas/rx.c         |  459 +++++
>  drivers/net/wireless/libertas/sbi.h        |   40 +
>  drivers/net/wireless/libertas/scan.c       | 2044 ++++++++++++++++++++
>  drivers/net/wireless/libertas/scan.h       |  216 +++
>  drivers/net/wireless/libertas/thread.h     |   52 +
>  drivers/net/wireless/libertas/tx.c         |  285 +++
>  drivers/net/wireless/libertas/types.h      |  289 +++
>  drivers/net/wireless/libertas/version.h    |    8 +
>  drivers/net/wireless/libertas/wext.c       | 2769 ++++++++++++++++++++++++++++
>  drivers/net/wireless/libertas/wext.h       |  147 ++
>  include/net/ieee80211_radiotap.h           |   31 +-
>  40 files changed, 22351 insertions(+), 1 deletions(-)
>  create mode 100644 drivers/net/wireless/libertas/11d.c
>  create mode 100644 drivers/net/wireless/libertas/11d.h
>  create mode 100644 drivers/net/wireless/libertas/LICENSE
>  create mode 100644 drivers/net/wireless/libertas/Makefile
>  create mode 100644 drivers/net/wireless/libertas/README
>  create mode 100644 drivers/net/wireless/libertas/assoc.c
>  create mode 100644 drivers/net/wireless/libertas/assoc.h
>  create mode 100644 drivers/net/wireless/libertas/cmd.c
>  create mode 100644 drivers/net/wireless/libertas/cmdresp.c
>  create mode 100644 drivers/net/wireless/libertas/debugfs.c
>  create mode 100644 drivers/net/wireless/libertas/debugfs.h
>  create mode 100644 drivers/net/wireless/libertas/decl.h
>  create mode 100644 drivers/net/wireless/libertas/defs.h
>  create mode 100644 drivers/net/wireless/libertas/dev.h
>  create mode 100644 drivers/net/wireless/libertas/ethtool.c
>  create mode 100644 drivers/net/wireless/libertas/fw.c
>  create mode 100644 drivers/net/wireless/libertas/fw.h
>  create mode 100644 drivers/net/wireless/libertas/host.h
>  create mode 100644 drivers/net/wireless/libertas/hostcmd.h
>  create mode 100644 drivers/net/wireless/libertas/if_bootcmd.c
>  create mode 100644 drivers/net/wireless/libertas/if_usb.c
>  create mode 100644 drivers/net/wireless/libertas/if_usb.h
>  create mode 100644 drivers/net/wireless/libertas/ioctl.c
>  create mode 100644 drivers/net/wireless/libertas/join.c
>  create mode 100644 drivers/net/wireless/libertas/join.h
>  create mode 100644 drivers/net/wireless/libertas/main.c
>  create mode 100644 drivers/net/wireless/libertas/radiotap.h
>  create mode 100644 drivers/net/wireless/libertas/rx.c
>  create mode 100644 drivers/net/wireless/libertas/sbi.h
>  create mode 100644 drivers/net/wireless/libertas/scan.c
>  create mode 100644 drivers/net/wireless/libertas/scan.h
>  create mode 100644 drivers/net/wireless/libertas/thread.h
>  create mode 100644 drivers/net/wireless/libertas/tx.c
>  create mode 100644 drivers/net/wireless/libertas/types.h
>  create mode 100644 drivers/net/wireless/libertas/version.h
>  create mode 100644 drivers/net/wireless/libertas/wext.c
>  create mode 100644 drivers/net/wireless/libertas/wext.h

pulled into #upstream

Re: Please pull 'libertas' branch of wireless-2.6

[Christoph Hellwig]

Umm, I can't remember the updated driver ever beeig posted for review.
And to be honest I'd be surprised if it's in a good shape already.

Re: Please pull 'libertas' branch of wireless-2.6

[Marcelo Tosatti]

Hi Christoph,

On Sat, Mar 03, 2007 at 05:21:40AM +0000, Christoph Hellwig wrote:
> Umm, I can't remember the updated driver ever beeig posted for review.

http://lists.openwall.net/netdev/2007/02/10/25

> And to be honest I'd be surprised if it's in a good shape already.

Constructive comments are welcome... All comments made by Arnd (which
were many!) have been addressed.

Re: Please pull 'libertas' branch of wireless-2.6

[Christoph Hellwig]

On Sun, Mar 04, 2007 at 12:36:27PM -0300, Marcelo Tosatti wrote:
> Hi Christoph,
> 
> On Sat, Mar 03, 2007 at 05:21:40AM +0000, Christoph Hellwig wrote:
> > Umm, I can't remember the updated driver ever beeig posted for review.
> 
> http://lists.openwall.net/netdev/2007/02/10/25
> 
> > And to be honest I'd be surprised if it's in a good shape already.
> 
> Constructive comments are welcome... All comments made by Arnd (which
> were many!) have been addressed.

Comments on that versions from a quick read over it:

 - the __le* annotation issue you mentioned in the mail is important.
   We definitvely don't want any new drivers without endianess annotations,
   because there are far too many endianess problems.  Even more so
   in a case of a driver like this one that's only tested on LE hardware
   and has LE device endianess.
 - things like 11d.[ch] don't have business of beeing in a driver,
   this should be somewhere in common code.
 - there shouldn't be a LICENSE file in individual driver directories,
   especially if it's just plain old GPLv2.
 - please get rid of setting -DFOO flags in the Makefile, just use
   these directly as config symbols.
 - there shouldn't be a README file in the driver directory, this
   should be in Documentation/
 - please don't use wlan_* foo types.  a) this should be structs, not
   typedefs, and b) wlan is an utterly generic name for beeing inside
   a driver.  Then again most things using this should be inside
   generic code anyway.. (and yeah, all that is because the driver
   copied braindead linux-wlan-ng code that probably needs a major
   revision anyway)
 - there seems to be lots of tabs vs spaces messups
 - please get rid of the ENTER/LEAVE macros
 - there's an awful lot of headers without clear divided responsibilities,
   there should be only a few ones left (internal interfaces and hw
   interface basically)
 - having lowercase names for lots of hw commands is a very bad idea
   for readability
 - please get rid of all your private ioctls and iwpriv stuff
   (should I add !!!! here)
 - scan.h has very strange almost docbook comments, please convert
   them to real docbook comments and actually run things through
   the tools to make sure it's right.
 - scan.h has vi indentation comment helpers that are contrary to
   linux coding style..
 - the thread.h abstractions are really useless, opencoding them
   would make the code a lot more readable.  And make people
   notice it's actually wrong:
	o the return value from kthread_run needs to be checked
	o wlan_deactivate_thread is not needed at all
	o storing and checking the pid should go away
	o there is no need for an additional waitqueue, you can
	  just use wake_up_process for kernel threads.
 - most of types.h should not be there but you should be using
   the types from include/linux/*80211*
 - version.h shouldn't exist
 - the radiotap header changes should definitively not be in
   a "add a new driver" diff

Re: Please pull 'libertas' branch of wireless-2.6

[Marcelo Tosatti]

On Mon, Mar 05, 2007 at 02:08:25PM +0000, Christoph Hellwig wrote:
> On Sun, Mar 04, 2007 at 12:36:27PM -0300, Marcelo Tosatti wrote:
> > Hi Christoph,
> > 
> > On Sat, Mar 03, 2007 at 05:21:40AM +0000, Christoph Hellwig wrote:
> > > Umm, I can't remember the updated driver ever beeig posted for review.
> > 
> > http://lists.openwall.net/netdev/2007/02/10/25
> > 
> > > And to be honest I'd be surprised if it's in a good shape already.
> > 
> > Constructive comments are welcome... All comments made by Arnd (which
> > were many!) have been addressed.
> 
> Comments on that versions from a quick read over it:
> 
>  - the __le* annotation issue you mentioned in the mail is important.
>    We definitvely don't want any new drivers without endianess annotations,
>    because there are far too many endianess problems.  Even more so
>    in a case of a driver like this one that's only tested on LE hardware
>    and has LE device endianess.
>  - things like 11d.[ch] don't have business of beeing in a driver,
>    this should be somewhere in common code.

Most wireless drivers implement 11d internally. We certainly need to
unify the management code, but thats not a merge blocker.

>  - there shouldn't be a LICENSE file in individual driver directories,
>    especially if it's just plain old GPLv2.
>  - please get rid of setting -DFOO flags in the Makefile, just use
>    these directly as config symbols.
>  - there shouldn't be a README file in the driver directory, this
>    should be in Documentation/
>  - please don't use wlan_* foo types.  a) this should be structs, not
>    typedefs, and b) wlan is an utterly generic name for beeing inside
>    a driver.  Then again most things using this should be inside
>    generic code anyway.. (and yeah, all that is because the driver
>    copied braindead linux-wlan-ng code that probably needs a major
>    revision anyway)
>  - there seems to be lots of tabs vs spaces messups
>  - please get rid of the ENTER/LEAVE macros

These are useful for debugging. We have removed most of the useless ones 
already.

>  - there's an awful lot of headers without clear divided responsibilities,
>    there should be only a few ones left (internal interfaces and hw
>    interface basically)
>  - having lowercase names for lots of hw commands is a very bad idea
>    for readability
>  - please get rid of all your private ioctls and iwpriv stuff
>    (should I add !!!! here)

Rationale being? There are a bunch of device private knobs, and iwpriv
is the interface for such configuration. (????)

>  - scan.h has very strange almost docbook comments, please convert
>    them to real docbook comments and actually run things through
>    the tools to make sure it's right.
>  - scan.h has vi indentation comment helpers that are contrary to
>    linux coding style..
>  - the thread.h abstractions are really useless, opencoding them
>    would make the code a lot more readable.  And make people
>    notice it's actually wrong:
> 	o the return value from kthread_run needs to be checked
> 	o wlan_deactivate_thread is not needed at all
> 	o storing and checking the pid should go away
> 	o there is no need for an additional waitqueue, you can
> 	  just use wake_up_process for kernel threads.
>  - most of types.h should not be there but you should be using
>    the types from include/linux/*80211*
>  - version.h shouldn't exist
>  - the radiotap header changes should definitively not be in
>    a "add a new driver" diff

Other than this your comments are OK, will address them.

Thanks!

Re: Please pull 'libertas' branch of wireless-2.6

[Christoph Hellwig]

On Wed, Mar 07, 2007 at 03:16:38PM -0300, Marcelo Tosatti wrote:
> >  - please get rid of the ENTER/LEAVE macros
> 
> These are useful for debugging. We have removed most of the useless ones 
> already.

We've refused this on a lot of drivers.  If you really need this kind
of debugging talk to acme to use a variant of ostra for this.

> >  - please get rid of all your private ioctls and iwpriv stuff
> >    (should I add !!!! here)
> 
> Rationale being? There are a bunch of device private knobs, and iwpriv
> is the interface for such configuration. (????)

If you read netdev we're very very unhappy about device specific knobs,
as they are really painful to support.  You should also look at the
cfg80211 threads on why ioctls are really bad for moving to a knew
non-wext, non-ioctl config mechanism.  And for why iwpriv is particularly
bad look about the posts about the wext compat issues.

Re: Please pull 'libertas' branch of wireless-2.6

[Dan Williams]

On Wed, 2007-03-07 at 22:24 +0000, Christoph Hellwig wrote:
> On Wed, Mar 07, 2007 at 03:16:38PM -0300, Marcelo Tosatti wrote:
> > >  - please get rid of the ENTER/LEAVE macros
> > 
> > These are useful for debugging. We have removed most of the useless ones 
> > already.
> 
> We've refused this on a lot of drivers.  If you really need this kind
> of debugging talk to acme to use a variant of ostra for this.
> 
> > >  - please get rid of all your private ioctls and iwpriv stuff
> > >    (should I add !!!! here)
> > 
> > Rationale being? There are a bunch of device private knobs, and iwpriv
> > is the interface for such configuration. (????)
> 
> If you read netdev we're very very unhappy about device specific knobs,
> as they are really painful to support.  You should also look at the
> cfg80211 threads on why ioctls are really bad for moving to a knew
> non-wext, non-ioctl config mechanism.  And for why iwpriv is particularly
> bad look about the posts about the wext compat issues.

We are unhappy with specific knobs _if_and_only_if_ they duplicate
functionality that's currently available.

That means, for example, the prism2 WPA ioctls, because WE-19 has
equivalent functionality.  Other examples include many of the madwifi
ioctls like auth_mode for which there are WEXT calls.  Others include
the ones for creating virtual STAs that are now subsumed by mac80211.

For stuff that's seriously not common among drivers, there's nothing
else that drivers can do but provide private ioctls.

Dan

Re: Please pull 'libertas' branch of wireless-2.6

[Christoph Hellwig]

On Wed, Mar 07, 2007 at 09:40:51PM -0500, Dan Williams wrote:
> That means, for example, the prism2 WPA ioctls, because WE-19 has
> equivalent functionality.  Other examples include many of the madwifi
> ioctls like auth_mode for which there are WEXT calls.  Others include
> the ones for creating virtual STAs that are now subsumed by mac80211.
> 
> For stuff that's seriously not common among drivers, there's nothing
> else that drivers can do but provide private ioctls.

No, we're more than unhappy with private knobs in general.  Each and
every of them needs an good explanation on

 a) why it's needed
 b) why you can use an existing common interface
 c) why it doesn't make sense to add a new common interface

see all the discussion on this on say netdev or linux-scsi.

Realize it, private interfaces are really bad, it means you need
special userspace for a single driver, that's exactly the thing
we try to avoid at all cost.

Re: Please pull 'libertas' branch of wireless-2.6

[Michael Buesch]

On Thursday 08 March 2007 03:40, Dan Williams wrote:
> We are unhappy with specific knobs _if_and_only_if_ they duplicate
> functionality that's currently available.
> 
> That means, for example, the prism2 WPA ioctls, because WE-19 has
> equivalent functionality.  Other examples include many of the madwifi
> ioctls like auth_mode for which there are WEXT calls.  Others include
> the ones for creating virtual STAs that are now subsumed by mac80211.
> 
> For stuff that's seriously not common among drivers, there's nothing
> else that drivers can do but provide private ioctls.

Exactly.
And, if you add some private tuning knob, you should think about,
if it doesn't really belong to a common place like cfg80211, if other
devices have similiar functionality.

If it's really private to your device, doing some private tuning knob
is perfectly fine. But maybe you should consider sysfs, configfs or something
like that, because iwpriv is going to die with WEXT.

-- 
Greetings Michael.

Please pull 'libertas' branch of wireless-2.6

[John W. Linville]

I'm not sure why I still have libertas as a separate branch, but I do.
I don't think this should cause any trouble for you, but I figured
I'd say something in case you were wondering. :-)

Anyway, this is intended for the 'upstream' branch of netdev-2.6.
You already had pulled libertas there when last I checked.

BTW, Pavel's patch is here instead of in another branch because it
depends on changes from the original libertas driver patch.

Thanks,

John

---

The following changes since commit 971a89608a33ab591c85aa00777acd9ad05f9e82:
  John W. Linville (1):
        Merge branch 'from-linus' into libertas

are found in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git libertas

Pavel Roskin (1):
      sparse-annotate radiotap header

Tony Breeds (1):
      libertas: use standard kernel macros

 drivers/net/wireless/libertas/debugfs.c |   41 ++--------------------
 include/net/ieee80211_radiotap.h        |   57 ++++++++++++++++---------------
 2 files changed, 33 insertions(+), 65 deletions(-)

diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 3ad1e03..51dfd20 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -1772,8 +1772,8 @@ void libertas_debugfs_remove_one(wlan_private *priv)
 
 /* debug entry */
 
-#define item_size(n) (sizeof ((wlan_adapter *)0)->n)
-#define item_addr(n) ((u32) &((wlan_adapter *)0)->n)
+#define item_size(n)	(FIELD_SIZEOF(wlan_adapter, n))
+#define item_addr(n)	(offsetof(wlan_adapter, n))
 
 struct debug_data {
 	char name[32];
@@ -1789,40 +1789,7 @@ static struct debug_data items[] = {
 	{"psstate", item_size(psstate), item_addr(psstate)},
 };
 
-static int num_of_items = sizeof(items) / sizeof(items[0]);
-
-/**
- *  @brief convert string to number
- *
- *  @param s   	   pointer to numbered string
- *  @return 	   converted number from string s
- */
-static int string_to_number(char *s)
-{
-	int r = 0;
-	int base = 0;
-
-	if ((strncmp(s, "0x", 2) == 0) || (strncmp(s, "0X", 2) == 0))
-		base = 16;
-	else
-		base = 10;
-
-	if (base == 16)
-		s += 2;
-
-	for (s = s; *s != 0; s++) {
-		if ((*s >= 48) && (*s <= 57))
-			r = (r * base) + (*s - 48);
-		else if ((*s >= 65) && (*s <= 70))
-			r = (r * base) + (*s - 55);
-		else if ((*s >= 97) && (*s <= 102))
-			r = (r * base) + (*s - 87);
-		else
-			break;
-	}
-
-	return r;
-}
+static int num_of_items = ARRAY_SIZE(items);
 
 /**
  *  @brief proc read function
@@ -1912,7 +1879,7 @@ static int wlan_debugfs_write(struct file *f, const char __user *buf,
 			if (!p2)
 				break;
 			p2++;
-			r = string_to_number(p2);
+			r = simple_strtoul(p2, NULL, 0);
 			if (d[i].size == 1)
 				*((u8 *) d[i].addr) = (u8) r;
 			else if (d[i].size == 2)
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
index c6e0d81..f3bc00e 100644
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
@@ -66,7 +66,9 @@
  */
 #define IEEE80211_RADIOTAP_HDRLEN	64
 
-/* The radio capture header precedes the 802.11 header. */
+/* The radio capture header precedes the 802.11 header.
+ * All data in the header is little endian on all platforms.
+ */
 struct ieee80211_radiotap_header {
 	u8 it_version;		/* Version 0. Only increases
 				 * for drastic changes,
@@ -74,12 +76,12 @@ struct ieee80211_radiotap_header {
 				 * new fields does not count.
 				 */
 	u8 it_pad;
-	u16 it_len;		/* length of the whole
+	__le16 it_len;		/* length of the whole
 				 * header in bytes, including
 				 * it_version, it_pad,
 				 * it_len, and data fields.
 				 */
-	u32 it_present;		/* A bitmap telling which
+	__le32 it_present;	/* A bitmap telling which
 				 * fields are present. Set bit 31
 				 * (0x80000000) to extend the
 				 * bitmap by another 32 bits.
@@ -88,104 +90,103 @@ struct ieee80211_radiotap_header {
 				 */
 };
 
-/* Name                                 Data type       Units
- * ----                                 ---------       -----
+/* Name                                 Data type    Units
+ * ----                                 ---------    -----
  *
- * IEEE80211_RADIOTAP_TSFT              u64       microseconds
+ * IEEE80211_RADIOTAP_TSFT              __le64       microseconds
  *
  *      Value in microseconds of the MAC's 64-bit 802.11 Time
  *      Synchronization Function timer when the first bit of the
  *      MPDU arrived at the MAC. For received frames, only.
  *
- * IEEE80211_RADIOTAP_CHANNEL           2 x u16   MHz, bitmap
+ * IEEE80211_RADIOTAP_CHANNEL           2 x __le16   MHz, bitmap
  *
  *      Tx/Rx frequency in MHz, followed by flags (see below).
  *
- * IEEE80211_RADIOTAP_FHSS              u16       see below
+ * IEEE80211_RADIOTAP_FHSS              __le16       see below
  *
  *      For frequency-hopping radios, the hop set (first byte)
  *      and pattern (second byte).
  *
- * IEEE80211_RADIOTAP_RATE              u8        500kb/s
+ * IEEE80211_RADIOTAP_RATE              u8           500kb/s
  *
  *      Tx/Rx data rate
  *
- * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     int8_t          decibels from
- *                                                      one milliwatt (dBm)
+ * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     s8           decibels from
+ *                                                   one milliwatt (dBm)
  *
  *      RF signal power at the antenna, decibel difference from
  *      one milliwatt.
  *
- * IEEE80211_RADIOTAP_DBM_ANTNOISE      int8_t          decibels from
- *                                                      one milliwatt (dBm)
+ * IEEE80211_RADIOTAP_DBM_ANTNOISE      s8           decibels from
+ *                                                   one milliwatt (dBm)
  *
  *      RF noise power at the antenna, decibel difference from one
  *      milliwatt.
  *
- * IEEE80211_RADIOTAP_DB_ANTSIGNAL      u8        decibel (dB)
+ * IEEE80211_RADIOTAP_DB_ANTSIGNAL      u8           decibel (dB)
  *
  *      RF signal power at the antenna, decibel difference from an
  *      arbitrary, fixed reference.
  *
- * IEEE80211_RADIOTAP_DB_ANTNOISE       u8        decibel (dB)
+ * IEEE80211_RADIOTAP_DB_ANTNOISE       u8           decibel (dB)
  *
  *      RF noise power at the antenna, decibel difference from an
  *      arbitrary, fixed reference point.
  *
- * IEEE80211_RADIOTAP_LOCK_QUALITY      u16       unitless
+ * IEEE80211_RADIOTAP_LOCK_QUALITY      __le16       unitless
  *
  *      Quality of Barker code lock. Unitless. Monotonically
  *      nondecreasing with "better" lock strength. Called "Signal
  *      Quality" in datasheets.  (Is there a standard way to measure
  *      this?)
  *
- * IEEE80211_RADIOTAP_TX_ATTENUATION    u16       unitless
+ * IEEE80211_RADIOTAP_TX_ATTENUATION    __le16       unitless
  *
  *      Transmit power expressed as unitless distance from max
  *      power set at factory calibration.  0 is max power.
  *      Monotonically nondecreasing with lower power levels.
  *
- * IEEE80211_RADIOTAP_DB_TX_ATTENUATION u16       decibels (dB)
+ * IEEE80211_RADIOTAP_DB_TX_ATTENUATION __le16       decibels (dB)
  *
  *      Transmit power expressed as decibel distance from max power
  *      set at factory calibration.  0 is max power.  Monotonically
  *      nondecreasing with lower power levels.
  *
- * IEEE80211_RADIOTAP_DBM_TX_POWER      int8_t          decibels from
- *                                                      one milliwatt (dBm)
+ * IEEE80211_RADIOTAP_DBM_TX_POWER      s8           decibels from
+ *                                                   one milliwatt (dBm)
  *
  *      Transmit power expressed as dBm (decibels from a 1 milliwatt
  *      reference). This is the absolute power level measured at
  *      the antenna port.
  *
- * IEEE80211_RADIOTAP_FLAGS             u8        bitmap
+ * IEEE80211_RADIOTAP_FLAGS             u8           bitmap
  *
  *      Properties of transmitted and received frames. See flags
  *      defined below.
  *
- * IEEE80211_RADIOTAP_ANTENNA           u8        antenna index
+ * IEEE80211_RADIOTAP_ANTENNA           u8           antenna index
  *
  *      Unitless indication of the Rx/Tx antenna for this packet.
  *      The first antenna is antenna 0.
  *
- * IEEE80211_RADIOTAP_RX_FLAGS          u_int16_t       bitmap
+ * IEEE80211_RADIOTAP_RX_FLAGS          __le16       bitmap
  *
  *     Properties of received frames. See flags defined below.
  *
- * IEEE80211_RADIOTAP_TX_FLAGS          u_int16_t       bitmap
+ * IEEE80211_RADIOTAP_TX_FLAGS          __le16       bitmap
  *
  *     Properties of transmitted frames. See flags defined below.
  *
- * IEEE80211_RADIOTAP_RTS_RETRIES       u_int8_t        data
+ * IEEE80211_RADIOTAP_RTS_RETRIES       u8           data
  *
  *     Number of rts retries a transmitted frame used.
  *
- * IEEE80211_RADIOTAP_DATA_RETRIES      u_int8_t        data
+ * IEEE80211_RADIOTAP_DATA_RETRIES      u8           data
  *
  *     Number of unicast retries a transmitted frame used.
  *
- *
- * IEEE80211_RADIOTAP_FCS           	u32       data
+ * IEEE80211_RADIOTAP_FCS           	__le32       data
  *
  *	FCS from frame in network byte order.
  */
-- 
John W. Linville
linville@tuxdriver.com

Re: Please pull 'libertas' branch of wireless-2.6

[Christoph Hellwig]

On Sat, Mar 03, 2007 at 05:21:40AM +0000, Christoph Hellwig wrote:
> Umm, I can't remember the updated driver ever beeig posted for review.
> And to be honest I'd be surprised if it's in a good shape already.

Of course it's not anywhere near good shape.  Almost all items from my
review were completely ignored, and we have another totoally substandard
wireless driver with crappy thread handling, a huge number of broken private
ioctls and partially absymal codingstyle.

And I didn't even get a reply to my mail addressing the concerns above.

Re: Please pull 'libertas' branch of wireless-2.6

[Dan Williams]

On Mon, 2007-05-07 at 11:41 +0100, Christoph Hellwig wrote:
> On Sat, Mar 03, 2007 at 05:21:40AM +0000, Christoph Hellwig wrote:
> > Umm, I can't remember the updated driver ever beeig posted for review.
> > And to be honest I'd be surprised if it's in a good shape already.
> 
> Of course it's not anywhere near good shape.  Almost all items from my
> review were completely ignored, and we have another totoally substandard
> wireless driver with crappy thread handling, a huge number of broken private
> ioctls and partially absymal codingstyle.

 - things like 11d.[ch] don't have business of being in a driver,
   this should be somewhere in common code.

There is no common code for this.  mac80211 will eventually grow a
utility library that libertas will hopefully be able to attach to.

 - please get rid of the ENTER/LEAVE macros

People have said that many drivers do this, and it's quite useful for
debugging.

 - please get rid of all your private ioctls and iwpriv stuff
   (should I add !!!! here)

Any ioctls that have equivalents in WEXT or ethtool can certainly be
removed.  Mesh ones like fwt_reset, bt_reset, mesh_get_ttl, etc have no
current equivalents and will need to stick around.  I've already removed
all the ones that were relevant for WPA and moved them to standard WEXT
calls.

 - most of types.h should not be there but you should be using
   the types from include/linux/*80211*

I've already updated libertas-2.6 git with a ton of updates for this.

In any case, lets push off any merge until 2.6.23 so the rest of the
comments can be dealt with:

 - the __le* annotation issue you mentioned in the mail is important.
 - there shouldn't be a LICENSE file in individual driver directories,
   especially if it's just plain old GPLv2.
 - please get rid of setting -DFOO flags in the Makefile, just use
   these directly as config symbols.
 - there shouldn't be a README file in the driver directory, this
   should be in Documentation/
 - please don't use wlan_* foo types.  a) this should be structs, not
   typedefs, and b) wlan is an utterly generic name for beeing inside
   a driver.
 - there seems to be lots of tabs vs spaces messups
 - there's an awful lot of headers without clear divided
responsibilities,
   there should be only a few ones left (internal interfaces and hw
   interface basically)
 - having lowercase names for lots of hw commands is a very bad idea
   for readability
 - etc

Dan

> And I didn't even get a reply to my mail addressing the concerns above.
> -
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Please pull 'libertas' branch of wireless-2.6

[John W. Linville]

[-- Attachment #1: Type: text/plain, Size: 2536 bytes --]

The following changes since commit 1f8a6b658a943b4f04a1fc7b3a420360202c86cd:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../bunk/trivial

are found in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git libertas

Dan Williams (19):
      libertas: remove WPA_SUPPLICANT structure
      libertas: use <net/ieee80211.h> for MAX_WPA_IE_LEN
      libertas: fix size of SSID comparison in stop_adhoc check
      libertas: remove 8021xauthalgs private ioctl
      libertas: remove setauthalg private ioctl
      libertas: remove incorrect vi modelines
      libertas: remove custom encryption mode stuff
      libertas: remove setwpaie private ioctl
      libertas: remove WLAN_802_11_AUTHENTICATION_MODE
      libertas: remove WLAN_802_11_WEP_STATUS enum
      libertas: remove WLAN_802_11_NETWORK_INFRASTRUCTURE enum
      libertas: Get rid of version.h
      libertas: Purge non-mesh ioctls
      libertas: remove SUPPORT_BOOT_COMMAND
      libertas: Clean up debug defines
      libertas: make debugfs.c sparse-clean
      libertas: fix missing unlock in TX error path
      libertas: sparse fixes
      libertas: 64-bit cleanups

 drivers/net/wireless/libertas/Makefile  |    9 -
 drivers/net/wireless/libertas/README    |  516 -----------
 drivers/net/wireless/libertas/assoc.c   |   41 +-
 drivers/net/wireless/libertas/cmd.c     |   23 +-
 drivers/net/wireless/libertas/cmdresp.c |    4 +-
 drivers/net/wireless/libertas/debugfs.c |   31 +-
 drivers/net/wireless/libertas/defs.h    |   52 +-
 drivers/net/wireless/libertas/dev.h     |   14 +-
 drivers/net/wireless/libertas/fw.c      |    9 +-
 drivers/net/wireless/libertas/if_usb.c  |    5 +-
 drivers/net/wireless/libertas/if_usb.h  |    2 -
 drivers/net/wireless/libertas/ioctl.c   | 1529 +------------------------------
 drivers/net/wireless/libertas/join.c    |  194 +----
 drivers/net/wireless/libertas/join.h    |    7 -
 drivers/net/wireless/libertas/main.c    |    7 +
 drivers/net/wireless/libertas/rx.c      |    4 +-
 drivers/net/wireless/libertas/scan.c    |  203 ++---
 drivers/net/wireless/libertas/scan.h    |   22 +-
 drivers/net/wireless/libertas/tx.c      |    2 +-
 drivers/net/wireless/libertas/version.h |    7 -
 drivers/net/wireless/libertas/wext.c    |  448 +--------
 drivers/net/wireless/libertas/wext.h    |   85 --
 22 files changed, 259 insertions(+), 2955 deletions(-)

Omnibus diff attached as "libertas-cleanups.patch.bz2" due to size concerns.

-- 
John W. Linville
linville@tuxdriver.com

[-- Attachment #2: libertas-cleanups.patch.bz2 --]
[-- Type: application/x-bzip2, Size: 24407 bytes --]

Re: Please pull 'libertas' branch of wireless-2.6

[Jeff Garzik]

John W. Linville wrote:
> The following changes since commit 1f8a6b658a943b4f04a1fc7b3a420360202c86cd:
>   Linus Torvalds (1):
>         Merge git://git.kernel.org/.../bunk/trivial
> 
> are found in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git libertas

pulled

Re: Please pull 'libertas' branch of wireless-2.6

[Jeff Garzik]

John W. Linville wrote:
> Lots of stuff here...probably best for 2.6.23...

Is this best for Linux users... or just easy for developers?

Won't putting off all these fixes until 2.6.23 leave the driver released 
in 2.6.22 in shoddy shape?

libertas is upstream now, so we cannot pretend that the driver is 
completely independent from upstream release cycles and maintenance.

libertas fixes should go upstream immediately, since we are in a bugfix 
cycle, and since libertas (from upstream perspective) is about to make 
its big debut on the world stage.

	Jeff

Re: Please pull 'libertas' branch of wireless-2.6

[Dan Williams]

On Wed, 2007-05-30 at 10:07 -0400, Jeff Garzik wrote:
> John W. Linville wrote:
> > Lots of stuff here...probably best for 2.6.23...
> 
> Is this best for Linux users... or just easy for developers?
> 
> Won't putting off all these fixes until 2.6.23 leave the driver released 
> in 2.6.22 in shoddy shape?

Not really; it more or less works there.  What's gone on since then is
general driver cleanup (Christoph's comments and more), splitting the
driver so that other bus types can use it (SDIO for example once
Pierre's SDIO patches get upstream), wireless extensions fixes, etc.

> libertas is upstream now, so we cannot pretend that the driver is 
> completely independent from upstream release cycles and maintenance.

True, but some of the stuff in here I didn't think would be suitable
during an -rc cycle, for example the driver splitting and the cleanups
that don't impact function at all, but are good to do nonetheless.

> libertas fixes should go upstream immediately, since we are in a bugfix 
> cycle, and since libertas (from upstream perspective) is about to make 
> its big debut on the world stage.

If you think all the bits from this should just go to 2.6.22, that's
fine with me.  But I don't feel comfortable making that call given what
I thought were the constraints on pushing changes through during an rc
cycle.  When the merge window was open, we backported critical bug fixes
and necessary merge-requirement cleanups to the code in linville's tree,
but avoided changes that didn't impact function.

Dan

Re: Please pull 'libertas' branch of wireless-2.6

[Dan Williams]

On Wed, 2007-05-30 at 11:28 -0400, Dan Williams wrote:
> On Wed, 2007-05-30 at 10:07 -0400, Jeff Garzik wrote:
> > John W. Linville wrote:
> > > Lots of stuff here...probably best for 2.6.23...
> > 
> > Is this best for Linux users... or just easy for developers?
> > 
> > Won't putting off all these fixes until 2.6.23 leave the driver released 
> > in 2.6.22 in shoddy shape?
> 
> Not really; it more or less works there.  What's gone on since then is
> general driver cleanup (Christoph's comments and more), splitting the
> driver so that other bus types can use it (SDIO for example once
> Pierre's SDIO patches get upstream), wireless extensions fixes, etc.
> 
> > libertas is upstream now, so we cannot pretend that the driver is 
> > completely independent from upstream release cycles and maintenance.
> 
> True, but some of the stuff in here I didn't think would be suitable
> during an -rc cycle, for example the driver splitting and the cleanups
> that don't impact function at all, but are good to do nonetheless.
> 
> > libertas fixes should go upstream immediately, since we are in a bugfix 
> > cycle, and since libertas (from upstream perspective) is about to make 
> > its big debut on the world stage.
> 
> If you think all the bits from this should just go to 2.6.22, that's
> fine with me.  But I don't feel comfortable making that call given what
> I thought were the constraints on pushing changes through during an rc
> cycle.  When the merge window was open, we backported critical bug fixes
> and necessary merge-requirement cleanups to the code in linville's tree,
> but avoided changes that didn't impact function.

Any response on these points yet?  I've got yet more cleanups and a few
other things queued in libertas-2.6 but I'd like to see where this
discussion goes before sending a pull request for the new bits.

Dan

> Dan
> 
> 
> -
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Please pull 'libertas' branch of wireless-2.6

[John W. Linville]

On Thu, May 31, 2007 at 05:13:17PM -0400, Dan Williams wrote:
> On Wed, 2007-05-30 at 11:28 -0400, Dan Williams wrote:
> > On Wed, 2007-05-30 at 10:07 -0400, Jeff Garzik wrote:
> > > John W. Linville wrote:
> > > > Lots of stuff here...probably best for 2.6.23...
> > > 
> > > Is this best for Linux users... or just easy for developers?
> > > 
> > > Won't putting off all these fixes until 2.6.23 leave the driver released 
> > > in 2.6.22 in shoddy shape?

> > If you think all the bits from this should just go to 2.6.22, that's
> > fine with me.  But I don't feel comfortable making that call given what
> > I thought were the constraints on pushing changes through during an rc
> > cycle.  When the merge window was open, we backported critical bug fixes
> > and necessary merge-requirement cleanups to the code in linville's tree,
> > but avoided changes that didn't impact function.
> 
> Any response on these points yet?  I've got yet more cleanups and a few
> other things queued in libertas-2.6 but I'd like to see where this
> discussion goes before sending a pull request for the new bits.

As for me, I have no great problem w/ the whole batch going to 2.6.22.
The driver is still new and most acknowledge it still has significant
defficiencies.  Most (but probably not all) of the patches would seem
to fit some definition of bug fix anyway.  I was just trying to err
on the side of caution and follow the normal "bugfixes in -rc" process.

Jeff, the branch in question is based off a vanilla 2.6.22-rc3.
So it is safe to pull (from a "won't mess-up my tree" perspective)
if you are so inclined.

John
-- 
John W. Linville
linville@tuxdriver.com

Re: Please pull 'libertas' branch of wireless-2.6

[Dan Williams]

On Thu, 2007-05-31 at 17:16 -0400, John W. Linville wrote:
> On Thu, May 31, 2007 at 05:13:17PM -0400, Dan Williams wrote:
> > On Wed, 2007-05-30 at 11:28 -0400, Dan Williams wrote:
> > > On Wed, 2007-05-30 at 10:07 -0400, Jeff Garzik wrote:
> > > > John W. Linville wrote:
> > > > > Lots of stuff here...probably best for 2.6.23...
> > > > 
> > > > Is this best for Linux users... or just easy for developers?
> > > > 
> > > > Won't putting off all these fixes until 2.6.23 leave the driver released 
> > > > in 2.6.22 in shoddy shape?
> 
> > > If you think all the bits from this should just go to 2.6.22, that's
> > > fine with me.  But I don't feel comfortable making that call given what
> > > I thought were the constraints on pushing changes through during an rc
> > > cycle.  When the merge window was open, we backported critical bug fixes
> > > and necessary merge-requirement cleanups to the code in linville's tree,
> > > but avoided changes that didn't impact function.
> > 
> > Any response on these points yet?  I've got yet more cleanups and a few
> > other things queued in libertas-2.6 but I'd like to see where this
> > discussion goes before sending a pull request for the new bits.
> 
> As for me, I have no great problem w/ the whole batch going to 2.6.22.
> The driver is still new and most acknowledge it still has significant
> defficiencies.  Most (but probably not all) of the patches would seem
> to fit some definition of bug fix anyway.  I was just trying to err
> on the side of caution and follow the normal "bugfixes in -rc" process.
> 
> Jeff, the branch in question is based off a vanilla 2.6.22-rc3.
> So it is safe to pull (from a "won't mess-up my tree" perspective)
> if you are so inclined.

Ok; if Jeff is so inclined, we'll push further libertas
cleanups/bugfixes/etc to you, and then you upstream to Jeff, targetted
for inclusion in 2.6.22.

Dan

Please pull 'libertas-fixes' branch of wireless-2.6

[John W. Linville]

Fixes identified by the libertas team as important for 2.6.22...

---

The following changes since commit 717c9339202a42ae7bec7d3c4b84deecdcae9f81:
  Dan Williams (1):
        libertas: reduce SSID and BSSID mixed-case abuse

are found in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git libertas-fixes

Dan Williams (1):
      libertas: actually send mesh frames to mesh netdev

Luis Carlos (1):
      libertas: convert libertas_mpp into anycast_mask

Luis Carlos Cobo Rus (2):
      libertas: pull current channel from firmware on mesh autostart
      libertas: deauthenticate from AP in channel switch

 drivers/net/wireless/libertas/assoc.c   |   13 +++++++++++++
 drivers/net/wireless/libertas/assoc.h   |    2 ++
 drivers/net/wireless/libertas/cmdresp.c |    1 +
 drivers/net/wireless/libertas/dev.h     |    1 +
 drivers/net/wireless/libertas/host.h    |    4 ++--
 drivers/net/wireless/libertas/main.c    |   27 ++++++++++++++-------------
 drivers/net/wireless/libertas/rx.c      |    5 ++---
 7 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index ee82413..f67efa0 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -200,6 +200,14 @@ static int update_channel(wlan_private * priv)
 				    cmd_option_waitforrsp, 0, NULL);
 }
 
+void libertas_sync_channel(struct work_struct *work)
+{
+	wlan_private *priv = container_of(work, wlan_private, sync_channel);
+
+	if (update_channel(priv) != 0)
+		lbs_pr_info("Channel synchronization failed.");
+}
+
 static int assoc_helper_channel(wlan_private *priv,
                                 struct assoc_request * assoc_req)
 {
@@ -403,6 +411,11 @@ static int should_deauth_infrastructure(wlan_adapter *adapter,
 		return 1;
 	}
 
+	if (test_bit(ASSOC_FLAG_CHANNEL, &assoc_req->flags)) {
+		lbs_deb_assoc("Deauthenticating due to channel switch.\n");
+		return 1;
+	}
+
 	/* FIXME: deal with 'auto' mode somehow */
 	if (test_bit(ASSOC_FLAG_MODE, &assoc_req->flags)) {
 		if (assoc_req->mode != IW_MODE_INFRA)
diff --git a/drivers/net/wireless/libertas/assoc.h b/drivers/net/wireless/libertas/assoc.h
index b5eddf8..5e9c31f 100644
--- a/drivers/net/wireless/libertas/assoc.h
+++ b/drivers/net/wireless/libertas/assoc.h
@@ -9,6 +9,8 @@ void libertas_association_worker(struct work_struct *work);
 
 struct assoc_request * wlan_get_association_request(wlan_adapter *adapter);
 
+void libertas_sync_channel(struct work_struct *work);
+
 #define ASSOC_DELAY (HZ / 2)
 static inline void wlan_postpone_association_work(wlan_private *priv)
 {
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index ebedd63..0c3b9a5 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -987,6 +987,7 @@ int libertas_process_event(wlan_private * priv)
 			netif_carrier_on(priv->mesh_dev) ;
 		}
 		adapter->mode = IW_MODE_ADHOC ;
+		schedule_work(&priv->sync_channel);
 		break;
 
 	default:
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index d6c340a..785192b 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -150,6 +150,7 @@ struct _wlan_private {
 
 	struct delayed_work assoc_work;
 	struct workqueue_struct *assoc_thread;
+	struct work_struct sync_channel;
 
 	/** Hardware access */
 	int (*hw_register_dev) (wlan_private * priv);
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index cedf1db..7509cc1 100644
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@ -310,8 +310,8 @@ enum cmd_mesh_access_opts {
 	cmd_act_mesh_get_ttl = 1,
 	cmd_act_mesh_set_ttl,
 	cmd_act_mesh_get_stats,
-	cmd_act_mesh_get_mpp,
-	cmd_act_mesh_set_mpp,
+	cmd_act_mesh_get_anycast,
+	cmd_act_mesh_set_anycast,
 };
 
 /** Card Event definition */
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index ec9be0c..623ab4b 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -178,45 +178,45 @@ u16 libertas_region_code_to_index[MRVDRV_MAX_REGION_CODE] =
  */
 
 /**
- * @brief Get function for sysfs attribute libertas_mpp
+ * @brief Get function for sysfs attribute anycast_mask
  */
-static ssize_t libertas_mpp_get(struct device * dev,
+static ssize_t libertas_anycast_get(struct device * dev,
 		struct device_attribute *attr, char * buf) {
 	struct cmd_ds_mesh_access mesh_access;
 
 	memset(&mesh_access, 0, sizeof(mesh_access));
 	libertas_prepare_and_send_command(to_net_dev(dev)->priv,
 			cmd_mesh_access,
-			cmd_act_mesh_get_mpp,
+			cmd_act_mesh_get_anycast,
 			cmd_option_waitforrsp, 0, (void *)&mesh_access);
 
-	return snprintf(buf, 3, "%d\n", le32_to_cpu(mesh_access.data[0]));
+	return snprintf(buf, 12, "0x%X\n", le32_to_cpu(mesh_access.data[0]));
 }
 
 /**
- * @brief Set function for sysfs attribute libertas_mpp
+ * @brief Set function for sysfs attribute anycast_mask
  */
-static ssize_t libertas_mpp_set(struct device * dev,
+static ssize_t libertas_anycast_set(struct device * dev,
 		struct device_attribute *attr, const char * buf, size_t count) {
 	struct cmd_ds_mesh_access mesh_access;
 	uint32_t datum;
 
 	memset(&mesh_access, 0, sizeof(mesh_access));
-	sscanf(buf, "%d", &datum);
+	sscanf(buf, "%x", &datum);
 	mesh_access.data[0] = cpu_to_le32(datum);
 
 	libertas_prepare_and_send_command((to_net_dev(dev))->priv,
 			cmd_mesh_access,
-			cmd_act_mesh_set_mpp,
+			cmd_act_mesh_set_anycast,
 			cmd_option_waitforrsp, 0, (void *)&mesh_access);
 	return strlen(buf);
 }
 
 /**
- * libertas_mpp attribute to be exported per mshX interface
- * through sysfs (/sys/class/net/mshX/libertas-mpp)
+ * anycast_mask attribute to be exported per mshX interface
+ * through sysfs (/sys/class/net/mshX/anycast_mask)
  */
-static DEVICE_ATTR(libertas_mpp, 0644, libertas_mpp_get, libertas_mpp_set );
+static DEVICE_ATTR(anycast_mask, 0644, libertas_anycast_get, libertas_anycast_set);
 
 /**
  *  @brief Check if the device can be open and wait if necessary.
@@ -847,6 +847,7 @@ int libertas_activate_card(wlan_private *priv, char *fw_name)
 	priv->assoc_thread =
 		create_singlethread_workqueue("libertas_assoc");
 	INIT_DELAYED_WORK(&priv->assoc_work, libertas_association_worker);
+	INIT_WORK(&priv->sync_channel, libertas_sync_channel);
 
 	/*
 	 * Register the device. Fillup the private data structure with
@@ -938,7 +939,7 @@ int libertas_add_mesh(wlan_private *priv, struct device *dev)
 		goto err_free;
 	}
 
-	ret = device_create_file(&(mesh_dev->dev), &dev_attr_libertas_mpp);
+	ret = device_create_file(&(mesh_dev->dev), &dev_attr_anycast_mask);
 	if (ret)
 		goto err_unregister;
 
@@ -1048,7 +1049,7 @@ void libertas_remove_mesh(wlan_private *priv)
 	netif_stop_queue(mesh_dev);
 	netif_carrier_off(priv->mesh_dev);
 
-	device_remove_file(&(mesh_dev->dev), &dev_attr_libertas_mpp);
+	device_remove_file(&(mesh_dev->dev), &dev_attr_anycast_mask);
 	unregister_netdev(mesh_dev);
 
 	priv->mesh_dev = NULL ;
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 5d70a76..88d9d2d 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -141,10 +141,9 @@ void libertas_upload_rx_packet(wlan_private * priv, struct sk_buff *skb)
 	lbs_deb_rx("skb->data %p\n", skb->data);
 
 	if (priv->mesh_dev && IS_MESH_FRAME(skb))
-		skb->dev = priv->mesh_dev;
+		skb->protocol = eth_type_trans(skb, priv->mesh_dev);
 	else
-		skb->dev = priv->dev;
-	skb->protocol = eth_type_trans(skb, priv->dev);
+		skb->protocol = eth_type_trans(skb, priv->dev);
 	skb->ip_summed = CHECKSUM_UNNECESSARY;
 
 	netif_rx(skb);
-- 
John W. Linville
linville@tuxdriver.com

Please pull 'libertas-upstream' branch of wireless-2.6

[John W. Linville]

[-- Attachment #1: Type: text/plain, Size: 3933 bytes --]

Patches identified by the libertas team as suitable for 2.6.23...

---

The following changes since commit 82fde74b94f11eee1e9c30e43fb162f80a5e63c0:
  Luis Carlos (1):
        libertas: convert libertas_mpp into anycast_mask

are found in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git libertas-upstream

Dan Williams (23):
      libertas: actually remove version.h
      libertas: kill wlan_scan_process_results
      libertas: kill ieeetypes_capinfo bitfield, use ieee80211.h types
      libertas: rename WLAN_802_11_KEY to enc_key and clean up usage
      libertas: clean up indentation in libertas_association_worker
      libertas: clean up 802.11 IE post-scan handling
      libertas: rename private ioctl constants and clean up ioctl handling
      libertas: remove if_bootcmd.c
      libertas: fix mixed-case abuse in cmd_ds_802_11_scan
      libertas: fix mixed-case abuse in cmd_ds_802_11_ad_hoc_result
      libertas: fix mixed-case abuse in cmd_ds_802_11_ad_hoc_start
      libertas: re-uppercase command defines and other constants
      libertas: fix debug build breakage due to field rename
      libertas: remove thread.h and make kthread usage clearer
      libertas: new mesh control knobs
      libertas: bump version to 322.p1
      libertas: wlan_ -> libertas_ rename in ioctl.c
      libertas: fix more mixed-case abuse
      libertas: move generic firmware reset command to common code
      libertas: wlan_ -> libertas_ function prefix renames for main.c
      libertas: simplify and clean up data rate handling
      libertas: fix MESH_[GET/SET]_BCASTR ioctl, clean up ioctl subcmd handling
      libertas: style fixes

Luis Carlos Cobo (1):
      libertas: specific mesh scan for mshX interface

 drivers/net/wireless/libertas/11d.c        |   22 +-
 drivers/net/wireless/libertas/Makefile     |    1 -
 drivers/net/wireless/libertas/README       |   65 ++++
 drivers/net/wireless/libertas/assoc.c      |   85 +++---
 drivers/net/wireless/libertas/cmd.c        |  338 ++++++++++----------
 drivers/net/wireless/libertas/cmdresp.c    |  172 +++++-----
 drivers/net/wireless/libertas/debugfs.c    |  130 ++++----
 drivers/net/wireless/libertas/decl.h       |    6 +-
 drivers/net/wireless/libertas/defs.h       |   66 ++---
 drivers/net/wireless/libertas/dev.h        |   34 +--
 drivers/net/wireless/libertas/ethtool.c    |    8 +-
 drivers/net/wireless/libertas/fw.c         |   43 ++--
 drivers/net/wireless/libertas/host.h       |  438 +++++++++++++-------------
 drivers/net/wireless/libertas/hostcmd.h    |   69 ++---
 drivers/net/wireless/libertas/if_bootcmd.c |   40 ---
 drivers/net/wireless/libertas/if_usb.c     |   58 ++--
 drivers/net/wireless/libertas/if_usb.h     |    1 -
 drivers/net/wireless/libertas/ioctl.c      |  478 +++++++++++++++-------------
 drivers/net/wireless/libertas/join.c       |  368 +++++++++++-----------
 drivers/net/wireless/libertas/join.h       |    2 +
 drivers/net/wireless/libertas/main.c       |  237 +++++++++------
 drivers/net/wireless/libertas/rx.c         |    9 +-
 drivers/net/wireless/libertas/scan.c       |  355 ++++++++-------------
 drivers/net/wireless/libertas/scan.h       |   10 +-
 drivers/net/wireless/libertas/thread.h     |   52 ---
 drivers/net/wireless/libertas/tx.c         |    2 +-
 drivers/net/wireless/libertas/types.h      |   65 +----
 drivers/net/wireless/libertas/version.h    |    1 -
 drivers/net/wireless/libertas/wext.c       |  428 ++++++++------------------
 drivers/net/wireless/libertas/wext.h       |   68 +++--
 30 files changed, 1684 insertions(+), 1967 deletions(-)
 delete mode 100644 drivers/net/wireless/libertas/if_bootcmd.c
 delete mode 100644 drivers/net/wireless/libertas/thread.h
 delete mode 100644 drivers/net/wireless/libertas/version.h

Omnibus patch attached as "libertas-upstream.diff.bz2" due to size concerns.
-- 
John W. Linville
linville@tuxdriver.com

[-- Attachment #2: libertas-upstream.diff.bz2 --]
[-- Type: application/x-bzip2, Size: 40341 bytes --]

Please pull 'libertas' branch of wireless-2.6 (resent w/o attachment)

[John W. Linville]

Resending w/o the attached patch, in case it was too big...yikes!

Individual patches are available here:

	http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/libertas

John

---

Jeff,

This is the same as the previous pull request, only rebased on
2.6.22-rc4.  Since this is a big pull already, I didn't want to
complicate it with the additional patches identified by the libertas
team as 2.6.22-worthy.

John

---

The following changes since commit 5ecd3100e695228ac5e0ce0e325e252c0f11806f:
  Linus Torvalds (1):
        Linux 2.6.22-rc4

are found in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git libertas

Chris Ball (1):
      libertas: wakeup both mesh and normal wakeup when getting out of scan

Dan Williams (25):
      libertas: call SET_NETDEV_DEV from common code
      libertas: replace 'macaddress' with 'bssid'
      libertas: correctly unregister mesh netdev on error
      libertas: don't tear down netdev in libertas_activate_card
      libertas: make scan result handling more flexible
      libertas: fix 'keep previous scan' behavior
      libertas: move channel changing into association framework
      libertas: make association paths consistent
      libertas: use MAC_FMT and MAC_ARG where appropriate
      libertas: use compare_ether_addr() rather than memcmp() where appropriate
      libertas: fix debug enter/leave prints for libertas_execute_next_command
      libertas: correctly balance locking in libertas_process_rx_command
      libertas: correct error report paths for wlan_fwt_list_ioctl
      libertas: fix deadlock SIOCGIWSCAN handler
      libertas: fix default adhoc channel
      libertas: honor specific channel requests during association
      libertas: send SIOCGIWSCAN event after partial scans too
      libertas: debug print spacing fixes in assoc.c
      libertas: add more verbose debugging to libertas_cmd_80211_authenticate
      libertas: Make WPA work through supplicant handshake
      libertas: sparse fixes
      libertas: tweak association debug output
      libertas: remove structure WLAN_802_11_SSID and libertas_escape_essid
      libertas: remove WPA_SUPPLICANT structure
      libertas: reduce SSID and BSSID mixed-case abuse

David Woodhouse (6):
      libertas: fix character set in README
      libertas: first pass at fixing up endianness issues
      libertas: More endianness fixes.
      libertas: more endianness fixes, in tx.c this time
      libertas: don't byte-swap firmware version number. It's a byte array.
      libertas: fix big-endian associate command.

Holger Schurig (23):
      libertas: rename wlan_association_worker
      libertas: a debug output was missing a newline
      libertas: fix removal of all debugfs files
      libertas: remove __FILE__ from debug output
      libertas: remove unused/superfluous definitions of DEV_NAME_LEN
      libertas: move vendor & product id's into if_usb.c
      libertas: make libertas_wlan_data_rates static
      libertas: exclude non-used code when PROC_DEBUG is not set
      libertas: make debug configurable
      libertas: tune debug code
      libertas: single out mesh code
      libertas: change debug output of libertas_interrupt()
      libertas: get rid of libertas_sbi_get_priv()
      libertas: fix SSID output
      libertas: changed some occurences of kmalloc() + memset(&a,0,sz) to kzalloc()
      libertas: move reset_device() code main.c to if_usb.c
      libertas: split wlan_add_card()
      libertas: indirect all hardware access via hw_XXXX functions
      libertas: move contents of fw.h to decl.h
      libertas: split module into two (libertas.ko and usb8xxx.ko)
      libertas: fix RESET logic at unload time
      libertas: let DRV_NAME be overridable
      libertas: remove unused variables in wlan_dev_t

Javier Cardona (2):
      libertas: fixed transmission flow control on the mesh interface
      libertas: added transmission failures to mesh statistics

Luis Carlos Cobo (4):
      libertas: fixed incorrect assigment of fcs errors to frag errors
      libertas: add URB debug info
      libertas: fixed kernel oops on module/card removal
      libertas: updated mesh commands for 5.220.9.p11

Luis Carlos Cobo Rus (6):
      libertas: version bump (321p0) and cmds update for new fw (5.220.10.p0)
      libertas: cleanup of fwt_list_route processing
      libertas: updated readme file
      libertas: make mac address configuration work with mesh interface too
      libertas: split wext for eth and msh
      libertas: support for mesh autostart on firmware 5.220.11

Marcelo Tosatti (5):
      libertas: scan two channels per scan command
      libertas: remove deprecated pm_register and associated code
      libertas: fix scanning from associate path
      libertas: fix error handling of card initialization
      libertas: fix oops on rmmod

 drivers/net/wireless/Kconfig               |   19 +-
 drivers/net/wireless/libertas/11d.c        |  152 ++--
 drivers/net/wireless/libertas/11d.h        |    6 +-
 drivers/net/wireless/libertas/Makefile     |    4 +-
 drivers/net/wireless/libertas/README       |   52 +-
 drivers/net/wireless/libertas/assoc.c      |  345 +++++---
 drivers/net/wireless/libertas/assoc.h      |    8 +-
 drivers/net/wireless/libertas/cmd.c        |  559 +++++------
 drivers/net/wireless/libertas/cmdresp.c    |  375 ++++----
 drivers/net/wireless/libertas/debugfs.c    |  432 ++++----
 drivers/net/wireless/libertas/decl.h       |   20 +-
 drivers/net/wireless/libertas/defs.h       |  101 ++-
 drivers/net/wireless/libertas/dev.h        |   98 +-
 drivers/net/wireless/libertas/ethtool.c    |   55 +-
 drivers/net/wireless/libertas/fw.c         |  111 +--
 drivers/net/wireless/libertas/fw.h         |   13 -
 drivers/net/wireless/libertas/host.h       |   13 +-
 drivers/net/wireless/libertas/hostcmd.h    |  392 ++++----
 drivers/net/wireless/libertas/if_bootcmd.c |    6 +-
 drivers/net/wireless/libertas/if_usb.c     |  448 +++++----
 drivers/net/wireless/libertas/if_usb.h     |   32 +-
 drivers/net/wireless/libertas/ioctl.c      |  286 ++++--
 drivers/net/wireless/libertas/join.c       |  464 ++++-----
 drivers/net/wireless/libertas/join.h       |   13 +-
 drivers/net/wireless/libertas/main.c       |  673 ++++++-------
 drivers/net/wireless/libertas/rx.c         |   63 +-
 drivers/net/wireless/libertas/sbi.h        |   40 -
 drivers/net/wireless/libertas/scan.c       | 1529 +++++++++++++---------------
 drivers/net/wireless/libertas/scan.h       |   81 +-
 drivers/net/wireless/libertas/thread.h     |    8 +-
 drivers/net/wireless/libertas/tx.c         |   74 +-
 drivers/net/wireless/libertas/types.h      |   63 +-
 drivers/net/wireless/libertas/wext.c       |  778 ++++++++-------
 drivers/net/wireless/libertas/wext.h       |   13 +-
 34 files changed, 3679 insertions(+), 3647 deletions(-)
 delete mode 100644 drivers/net/wireless/libertas/fw.h
 delete mode 100644 drivers/net/wireless/libertas/sbi.h

-- 
John W. Linville
linville@tuxdriver.com

Re: Please pull 'libertas-fixes' branch of wireless-2.6

[Jeff Garzik]

John W. Linville wrote:
> Fixes identified by the libertas team as important for 2.6.22...
> 
> ---
> 
> The following changes since commit 717c9339202a42ae7bec7d3c4b84deecdcae9f81:
>   Dan Williams (1):
>         libertas: reduce SSID and BSSID mixed-case abuse
> 
> are found in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git libertas-fixes
> 
> Dan Williams (1):
>       libertas: actually send mesh frames to mesh netdev
> 
> Luis Carlos (1):
>       libertas: convert libertas_mpp into anycast_mask
> 
> Luis Carlos Cobo Rus (2):
>       libertas: pull current channel from firmware on mesh autostart
>       libertas: deauthenticate from AP in channel switch

Just to be clear, you intend 'libertas' and 'libertas-fixes' (in that 
order) for 2.6.22, and 'libertas-upstream' for 2.6.23?

	Jeff

Re: Please pull 'libertas-fixes' branch of wireless-2.6

[John W. Linville]

On Tue, Jun 12, 2007 at 06:54:35PM -0400, Jeff Garzik wrote:
> John W. Linville wrote:
> >Fixes identified by the libertas team as important for 2.6.22...
> >
> >---
> >
> >The following changes since commit 
> >717c9339202a42ae7bec7d3c4b84deecdcae9f81:
> >  Dan Williams (1):
> >        libertas: reduce SSID and BSSID mixed-case abuse
> >
> >are found in the git repository at:
> >
> >  git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git 
> >  libertas-fixes
> >
> >Dan Williams (1):
> >      libertas: actually send mesh frames to mesh netdev
> >
> >Luis Carlos (1):
> >      libertas: convert libertas_mpp into anycast_mask
> >
> >Luis Carlos Cobo Rus (2):
> >      libertas: pull current channel from firmware on mesh autostart
> >      libertas: deauthenticate from AP in channel switch
> 
> Just to be clear, you intend 'libertas' and 'libertas-fixes' (in that 
> order) for 2.6.22, and 'libertas-upstream' for 2.6.23?

Yes, correct.

Thanks,

John
-- 
John W. Linville
linville@tuxdriver.com

Re: Please pull 'libertas-fixes' branch of wireless-2.6

[Jeff Garzik]

John W. Linville wrote:
> Fixes identified by the libertas team as important for 2.6.22...
> 
> ---
> 
> The following changes since commit 717c9339202a42ae7bec7d3c4b84deecdcae9f81:
>   Dan Williams (1):
>         libertas: reduce SSID and BSSID mixed-case abuse
> 
> are found in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git libertas-fixes
> 
> Dan Williams (1):
>       libertas: actually send mesh frames to mesh netdev
> 
> Luis Carlos (1):
>       libertas: convert libertas_mpp into anycast_mask
> 
> Luis Carlos Cobo Rus (2):
>       libertas: pull current channel from firmware on mesh autostart
>       libertas: deauthenticate from AP in channel switch
> 
>  drivers/net/wireless/libertas/assoc.c   |   13 +++++++++++++
>  drivers/net/wireless/libertas/assoc.h   |    2 ++
>  drivers/net/wireless/libertas/cmdresp.c |    1 +
>  drivers/net/wireless/libertas/dev.h     |    1 +
>  drivers/net/wireless/libertas/host.h    |    4 ++--
>  drivers/net/wireless/libertas/main.c    |   27 ++++++++++++++-------------
>  drivers/net/wireless/libertas/rx.c      |    5 ++---
>  7 files changed, 35 insertions(+), 18 deletions(-)

pulled into #upstream-fixes

Re: Please pull 'libertas' branch of wireless-2.6 (resent w/o attachment)

[Jeff Garzik]

John W. Linville wrote:
> Resending w/o the attached patch, in case it was too big...yikes!
> 
> Individual patches are available here:
> 
> 	http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/libertas
> 
> John
> 
> ---
> 
> Jeff,
> 
> This is the same as the previous pull request, only rebased on
> 2.6.22-rc4.  Since this is a big pull already, I didn't want to
> complicate it with the additional patches identified by the libertas
> team as 2.6.22-worthy.
> 
> John
> 
> ---
> 
> The following changes since commit 5ecd3100e695228ac5e0ce0e325e252c0f11806f:
>   Linus Torvalds (1):
>         Linux 2.6.22-rc4
> 
> are found in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git libertas
> 
> Chris Ball (1):
>       libertas: wakeup both mesh and normal wakeup when getting out of scan
> 
> Dan Williams (25):
>       libertas: call SET_NETDEV_DEV from common code
>       libertas: replace 'macaddress' with 'bssid'
>       libertas: correctly unregister mesh netdev on error
>       libertas: don't tear down netdev in libertas_activate_card
>       libertas: make scan result handling more flexible
>       libertas: fix 'keep previous scan' behavior
>       libertas: move channel changing into association framework
>       libertas: make association paths consistent
>       libertas: use MAC_FMT and MAC_ARG where appropriate
>       libertas: use compare_ether_addr() rather than memcmp() where appropriate
>       libertas: fix debug enter/leave prints for libertas_execute_next_command
>       libertas: correctly balance locking in libertas_process_rx_command
>       libertas: correct error report paths for wlan_fwt_list_ioctl
>       libertas: fix deadlock SIOCGIWSCAN handler
>       libertas: fix default adhoc channel
>       libertas: honor specific channel requests during association
>       libertas: send SIOCGIWSCAN event after partial scans too
>       libertas: debug print spacing fixes in assoc.c
>       libertas: add more verbose debugging to libertas_cmd_80211_authenticate
>       libertas: Make WPA work through supplicant handshake
>       libertas: sparse fixes
>       libertas: tweak association debug output
>       libertas: remove structure WLAN_802_11_SSID and libertas_escape_essid
>       libertas: remove WPA_SUPPLICANT structure
>       libertas: reduce SSID and BSSID mixed-case abuse
> 
> David Woodhouse (6):
>       libertas: fix character set in README
>       libertas: first pass at fixing up endianness issues
>       libertas: More endianness fixes.
>       libertas: more endianness fixes, in tx.c this time
>       libertas: don't byte-swap firmware version number. It's a byte array.
>       libertas: fix big-endian associate command.
> 
> Holger Schurig (23):
>       libertas: rename wlan_association_worker
>       libertas: a debug output was missing a newline
>       libertas: fix removal of all debugfs files
>       libertas: remove __FILE__ from debug output
>       libertas: remove unused/superfluous definitions of DEV_NAME_LEN
>       libertas: move vendor & product id's into if_usb.c
>       libertas: make libertas_wlan_data_rates static
>       libertas: exclude non-used code when PROC_DEBUG is not set
>       libertas: make debug configurable
>       libertas: tune debug code
>       libertas: single out mesh code
>       libertas: change debug output of libertas_interrupt()
>       libertas: get rid of libertas_sbi_get_priv()
>       libertas: fix SSID output
>       libertas: changed some occurences of kmalloc() + memset(&a,0,sz) to kzalloc()
>       libertas: move reset_device() code main.c to if_usb.c
>       libertas: split wlan_add_card()
>       libertas: indirect all hardware access via hw_XXXX functions
>       libertas: move contents of fw.h to decl.h
>       libertas: split module into two (libertas.ko and usb8xxx.ko)
>       libertas: fix RESET logic at unload time
>       libertas: let DRV_NAME be overridable
>       libertas: remove unused variables in wlan_dev_t
> 
> Javier Cardona (2):
>       libertas: fixed transmission flow control on the mesh interface
>       libertas: added transmission failures to mesh statistics
> 
> Luis Carlos Cobo (4):
>       libertas: fixed incorrect assigment of fcs errors to frag errors
>       libertas: add URB debug info
>       libertas: fixed kernel oops on module/card removal
>       libertas: updated mesh commands for 5.220.9.p11
> 
> Luis Carlos Cobo Rus (6):
>       libertas: version bump (321p0) and cmds update for new fw (5.220.10.p0)
>       libertas: cleanup of fwt_list_route processing
>       libertas: updated readme file
>       libertas: make mac address configuration work with mesh interface too
>       libertas: split wext for eth and msh
>       libertas: support for mesh autostart on firmware 5.220.11
> 
> Marcelo Tosatti (5):
>       libertas: scan two channels per scan command
>       libertas: remove deprecated pm_register and associated code
>       libertas: fix scanning from associate path
>       libertas: fix error handling of card initialization
>       libertas: fix oops on rmmod
> 
>  drivers/net/wireless/Kconfig               |   19 +-
>  drivers/net/wireless/libertas/11d.c        |  152 ++--
>  drivers/net/wireless/libertas/11d.h        |    6 +-
>  drivers/net/wireless/libertas/Makefile     |    4 +-
>  drivers/net/wireless/libertas/README       |   52 +-
>  drivers/net/wireless/libertas/assoc.c      |  345 +++++---
>  drivers/net/wireless/libertas/assoc.h      |    8 +-
>  drivers/net/wireless/libertas/cmd.c        |  559 +++++------
>  drivers/net/wireless/libertas/cmdresp.c    |  375 ++++----
>  drivers/net/wireless/libertas/debugfs.c    |  432 ++++----
>  drivers/net/wireless/libertas/decl.h       |   20 +-
>  drivers/net/wireless/libertas/defs.h       |  101 ++-
>  drivers/net/wireless/libertas/dev.h        |   98 +-
>  drivers/net/wireless/libertas/ethtool.c    |   55 +-
>  drivers/net/wireless/libertas/fw.c         |  111 +--
>  drivers/net/wireless/libertas/fw.h         |   13 -
>  drivers/net/wireless/libertas/host.h       |   13 +-
>  drivers/net/wireless/libertas/hostcmd.h    |  392 ++++----
>  drivers/net/wireless/libertas/if_bootcmd.c |    6 +-
>  drivers/net/wireless/libertas/if_usb.c     |  448 +++++----
>  drivers/net/wireless/libertas/if_usb.h     |   32 +-
>  drivers/net/wireless/libertas/ioctl.c      |  286 ++++--
>  drivers/net/wireless/libertas/join.c       |  464 ++++-----
>  drivers/net/wireless/libertas/join.h       |   13 +-
>  drivers/net/wireless/libertas/main.c       |  673 ++++++-------
>  drivers/net/wireless/libertas/rx.c         |   63 +-
>  drivers/net/wireless/libertas/sbi.h        |   40 -
>  drivers/net/wireless/libertas/scan.c       | 1529 +++++++++++++---------------
>  drivers/net/wireless/libertas/scan.h       |   81 +-
>  drivers/net/wireless/libertas/thread.h     |    8 +-
>  drivers/net/wireless/libertas/tx.c         |   74 +-
>  drivers/net/wireless/libertas/types.h      |   63 +-
>  drivers/net/wireless/libertas/wext.c       |  778 ++++++++-------
>  drivers/net/wireless/libertas/wext.h       |   13 +-
>  34 files changed, 3679 insertions(+), 3647 deletions(-)
>  delete mode 100644 drivers/net/wireless/libertas/fw.h
>  delete mode 100644 drivers/net/wireless/libertas/sbi.h

pulled into #upstream-fixes

Re: Please pull 'libertas-upstream' branch of wireless-2.6

[Jeff Garzik]

John W. Linville wrote:
> Patches identified by the libertas team as suitable for 2.6.23...
> 
> ---
> 
> The following changes since commit 82fde74b94f11eee1e9c30e43fb162f80a5e63c0:
>   Luis Carlos (1):
>         libertas: convert libertas_mpp into anycast_mask
> 
> are found in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git libertas-upstream

since it sounds like some additional 2.6.22 (warning?) fixes will be 
coming, I'm going to hold off pulling this.  I would rather the wireless 
maintainer sort out the merging in this case :)  Once 2.6.22 is all 
upstream, please do resend this push...