Please pull 'upstream' branch of rt2x00

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

A new update of rt2x00 is ready. :)

Perhaps the most interesting thing would be the removal
of passive scan support, because it was a purely software based
solution that (if really required) could best be resolved in mac80211
rather then the driver for devices that don't support such a thing in the
hardware.
The rest is just code being moved around, (more specifically code being moved
from the drivers toward rt2x00lib/pci/usb. There aren't any specific bugfixes made.

Ivo

---

The following changes since commit 9e4fd17309d0acddd1748c76f6bd35a0c85446b6:
  Johannes Berg (1):
        clarify locking comment in cfg80211

are found in the git repository at:

  http://git.serialmonkey.com/rt2x00.git/ upstream

Ivo van Doorn (38):
      rt2x00: Move beaconhandling into rt2x00{usb,pci} modules
      rt2x00: Fix rt2x00pci, rt2x00usb, rt2x00mac module/debug enviroment
      rt2x00: Move common rxdone and txdone code into rt2x00lib
      rt2x00: Set rf_base during channel configuration
      rt2x00: Move initialize() and uninitialize() into rt2x00pci/rt2x00usb
      rt2x00: Fix spellin error
      rt2x00: Move ieee80211_hw init & registration into rt2x00lib
      rt2x00: Fix hardware mode registration order
      rt2x00: Add struct debugsfs pointer to rt2x00dev
      rt2x00: Fix debugfs related compile problem
      rt2x00: Explicit return type for rt2x00debug_register
      rt2x00: Fix sparse errors
      rt2x00: Move alloc_rings into rt2x00lib
      rt2x00: Move device allocation into rt2x00lib
      rt2x00: Make rt2x00debug const
      rt2x00: Minor fixes (comment & headers)
      rt2x00: Create rt2x00_ops structure
      rt2x00: rt2x00pci shouldn't use DRV_NAME for irq registration
      rt2x00: Rename rt(25)73 identifications
      rt2x00: Move PCI/USB handlers into rt2x00pci/usb modules
      rt2x00: Fix hw mode registration
      rt2x00: Fix NULL pointer exeption during init_hw
      rt2x00: Fix sparse warnings
      rt2x00: Fix ERROR strings
      rt2x00: Move rf values outside functions
      rt2x00: Allocate enough rings
      rt2x00: Move write_tx_data functions into rt2x00pci/usb
      rt2x00: Fix compilation error when not selecting rt61pci and rt73usb
      rt2x00: Add return statement to rt2x00lib_alloc_dev
      rt2x00: Create dummy rt2x00lib_firmware_load_wait()
      rt2x00: Move write_tx_desc initialization into rt2x00lib
      rt2x00: Remove ENTRY_RTS_CTS_FRAME flag
      rt2x00: Fix check for Acked frames
      Merge branch 'wireless-dev'
      rt2x00: Remove passive scanning support
      rt2x00: Set channel_change_time to 0
      rt2x00: Move USB txdone handler into rt2x00usb
      rt2x00: rt61 should call ieee80211_wake_queue only for correct queues

 drivers/net/wireless/mac80211/rt2x00/Makefile      |    2 +
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c   | 1303 +++------------
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.h   |    9 +-
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.c   | 1496 ++++--------------
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.h   |    7 -
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.c   | 1448 +++--------------
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.h   |    2 -
 drivers/net/wireless/mac80211/rt2x00/rt2x00.h      |  165 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c |   27 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h |    7 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c   |  689 +++++++-
 drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h   |   70 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c   |  166 +--
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c   |  587 +++++++
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h   |   50 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c   |  637 +++++++
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h   |   44 +-
 drivers/net/wireless/mac80211/rt2x00/rt61pci.c     | 1731 ++++---------------
 drivers/net/wireless/mac80211/rt2x00/rt61pci.h     |    7 -
 drivers/net/wireless/mac80211/rt2x00/rt73usb.c     | 1597 ++++---------------
 drivers/net/wireless/mac80211/rt2x00/rt73usb.h     |    4 +-
 21 files changed, 3553 insertions(+), 6495 deletions(-)
 create mode 100644 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c
 create mode 100644 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is the latest rt2x00 update. It is a rather small one.
Only 1 real fix, and the second path is cosmetic since it
will start a proper versioning of rt2x00.

This will most likely be the last pull request for the next 1 or 2 months
due to developer/time/health shortage.

The TODO list for rt2x00 has been expanding over the last few days,
so as soon as I am fully back there will be quite a lot to do. ;)
(http://rt2x00.serialmonkey.com/wiki/index.php?title=Rt2x00_beta#rt2x00_beta_status_page)

Ivo

---

The following changes since commit 5209b1eff0b1891d8bb002eb067a11b4caa5f5bc:
  John W. Linville (1):
        Merge branch 'from-linus'

are found in the git repository at:

  http://git.serialmonkey.com/rt2x00.git/ upstream

Ivo van Doorn (2):
      rt2x00: release 2.0.0
      Merge branch 'wireless-dev'

Jan Kiszka (1):
      rt2x00: Fix master beacon setup

 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c |    8 +++-----
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.c |    8 +++-----
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.c |    8 +++-----
 drivers/net/wireless/mac80211/rt2x00/rt2x00.h    |    3 +--
 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c |   17 -----------------
 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c |   14 +++++++++++++-
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c |   17 -----------------
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c |   19 +------------------
 drivers/net/wireless/mac80211/rt2x00/rt61pci.c   |    8 +++-----
 drivers/net/wireless/mac80211/rt2x00/rt73usb.c   |    8 +++-----
 10 files changed, 30 insertions(+), 80 deletions(-)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is the new rt2x00 release: 2.0.1
It contains many patches since the previous release.
It doesn't address any major bugs that have been
reported, but the code has been cleaned up.

The most notable change is the addition of rfkill support. :)

Ivo

---

The following changes since commit 2e6c9eed7541f3e2a23a469f08e5be3ec28a129f:
  James Ketrenos (1):
        Add iwlwifi wireless drivers

are available in the git repository at:

  git://git.serialmonkey.com/rt2x00.git/ upstream

Gertjan van Wingerde (8):
      rt2x00: Move rxd_size and txd_size fields.
      rt2x00: Update firmware loading interface.
      rt2x00: Initialisation cleanup.
      Move firmware loading code out of main rt2x00lib source file.
      Fix debug support.
      Let lowlevel driver decide on firmware names.
      rt2x00: Provide cleaner firmware loading interface to lowlevel driver.
      rt2x00: Deregister debugs at firmware loading failure.

Ivo van Doorn (34):
      rt2x00: Add rfkill support
      rt2x00: Use MODULE_FIRMWARE
      rt2x00: cosmetic - rename CONFIG_RT2X00_DEBUGFS
      rt2x00: Move crc-itu-t usage into rt2x00lib
      rt2x00: Remove channel_change_time usage
      rt2x00: Apply the 80 character line rule
      rt2x00: Prevent forward declaration of functions
      rt2x00: When toggling RX the link tuner should also be toggled
      rt2x00: Move generic link_tuner code into rt2x00lib
      rt2x00: Make rt2400 link tuner work like legacy driver
      rt2x00: Remove activity_led
      rt2x00: Make sure link tuning follows Legacy guidelines
      rt2x00: Use correct values for r24, r25 and r26
      rt2x00: Add EEPROM recovery data
      rt2x00: Correctly initialize rt73usb PHY_CSR1
      rt2x00: Use defines for chipset assignments
      rt2x00: Merge kick_beacon_gen and kick_tx_queue
      rt2x00: Merge radio control functions into 1 callback function
      rt2x00: Make promisc mode available to USB devices
      rt2x00: Make use of open / stop handlers
      rt2x00: Cleanup flag handling
      rt2x00: Use linux/bitops.h
      rt2x00: Add FIELD8 and matching handlers
      rt2x00: Move drv_name field into rt2x00_ops
      rt2x00: rt2x00lib is in charge of forcing promisc mode
      rt2x00: Make debug messages more informative
      rt2x00: Fix rt61 typo
      rt2x00: Move CONFIG_RT2X00_LIB_DEBUGFS ifdef out of rt2x00dev.c
      rt2x00: Reduce indentation for txpower handlers
      rt2x00: Define ARCSR2, ARCSR3, ARCSR4 and ARCSR5 registers
      rt2x00: Fix compilation errors for rt2x00-rfkill
      Merge branch 'wireless-dev'
      rt2x00: Merge LENGTH_LOW and LENGTH_HIGH
      rt2x00: Release rt2x00 2.0.1

 drivers/net/wireless/mac80211/rt2x00/Kconfig       |   33 +-
 drivers/net/wireless/mac80211/rt2x00/Makefile      |   10 +-
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c   |  401 +++++++------
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.h   |   65 ++-
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.c   |  486 +++++++++-------
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.h   |   61 ++-
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.c   |  542 +++++++++++-------
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.h   |   29 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00.h      |  407 +++++++------
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c |   39 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h |   22 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c   |  264 ++++-----
 .../net/wireless/mac80211/rt2x00/rt2x00firmware.c  |  129 +++++
 .../net/wireless/mac80211/rt2x00/rt2x00firmware.h  |   49 ++
 drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h   |   15 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c   |  179 +++---
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c   |   98 ++--
 .../net/wireless/mac80211/rt2x00/rt2x00rfkill.c    |  133 +++++
 .../net/wireless/mac80211/rt2x00/rt2x00rfkill.h    |   51 ++
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c   |   76 ++--
 drivers/net/wireless/mac80211/rt2x00/rt61pci.c     |  601 ++++++++++++--------
 drivers/net/wireless/mac80211/rt2x00/rt61pci.h     |   33 +-
 drivers/net/wireless/mac80211/rt2x00/rt73usb.c     |  589 +++++++++++--------
 drivers/net/wireless/mac80211/rt2x00/rt73usb.h     |   33 +-
 24 files changed, 2589 insertions(+), 1756 deletions(-)
 create mode 100644 drivers/net/wireless/mac80211/rt2x00/rt2x00firmware.c
 create mode 100644 drivers/net/wireless/mac80211/rt2x00/rt2x00firmware.h
 create mode 100644 drivers/net/wireless/mac80211/rt2x00/rt2x00rfkill.c
 create mode 100644 drivers/net/wireless/mac80211/rt2x00/rt2x00rfkill.h

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is the 2.0.2 release of rt2x00.
As usual most changes are code cleaning,
followed by code moving into the library modules.
Unfortunately, this round still does not contain real bugfixes.
Hopefully the next release will really bugfixes. ;)

The actuall diff is quite big, but that is mainly because
of the cleanup in the register access functions which caused
all register functions to be renamed (which prevents namespace
pollution).

Ivo

---

The following changes since commit 9181e959da76d85d688d8ec763702ed2f3b4edf9:
  John W. Linville (1):
        rt2x00firmware.c: include delay.h to avoid build error on ppc64

are available in the git repository at:

  git://git.serialmonkey.com/rt2x00.git/ upstream

Gertjan van Wingerde (1):
      rt2x00: Clean up register access functions.

Ivo van Doorn (32):
      rt2x00: Remove debug module parameter
      rt2x00: Cleanup header
      rt2x00: *_bbp_check should not return magic value
      rt2x00: rt2400pci - Use BBPCSR for txdesc
      rt2x00: Make antenna selection more transparent
      rt2x00: Don't hardcode beacon interval
      rt2x00: Move config requirement into rt2x00lib
      rt2x00: Remove pointless 0xff checks
      rt2x00: Correct *_bbp_check
      rt2x00: Correctly set the flags for the correct flags field
      rt2x00: Remove unsused structure
      rt2x00: Don't export config functions to outside rt2x00lib
      Merge branch 'wireless-dev'
      rt2x00: Constify txd_size and rxd_size
      rt2x00: rt2x00lib_disable_radio should call toggle_rx
      rt2x00: Move USB radio enabling/disabling into rt2x00usb
      rt2x00: Remove ring->type
      rt2x00: Split rings into tx and rx arrays
      rt2x00: Split tx ring array into tx and bcn
      rt2x00: Move rt2x00{pci,usb} shared code into rt2x00lib
      rt2x00: Move ring allocation into rt2x00lib
      Merge branch 'wireless-dev'
      rt2x00: Fix ring array iteration
      rt2x00: Remove huge macro functions
      rt2x00: Include rt2x00firmware.h
      rt2x00: Move ring allocation partially into rt2x00lib
      rt2x00: Remove unused library call fields
      rt2x00: rt61 and rt73 do not support Atim
      rt2x00: link_tuner should be toggled when the radio is toggled
      rt2x00: Add EEPROM recovery code for mac address
      Merge branch 'wireless-dev'
      rt2x00: Release rt2x00 2.0.2

Mattias Nissler (1):
      rt73: Prevent oops when usb device is disconnected.

 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c   |  627 ++++++---------
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.h   |   28 +-
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.c   |  673 +++++++---------
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.h   |   34 +-
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.c   |  660 ++++++---------
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.h   |   38 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00.h      |  120 ++--
 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c   |  540 ++++++++++---
 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.h   |   60 ++
 .../net/wireless/mac80211/rt2x00/rt2x00firmware.c  |    7 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h   |   13 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c   |   52 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c   |  283 +------
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h   |   29 +
 .../net/wireless/mac80211/rt2x00/rt2x00rfkill.c    |    4 -
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c   |  323 +++-----
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h   |   14 +-
 drivers/net/wireless/mac80211/rt2x00/rt61pci.c     |  858 +++++++++-----------
 drivers/net/wireless/mac80211/rt2x00/rt61pci.h     |   43 +-
 drivers/net/wireless/mac80211/rt2x00/rt73usb.c     |  758 +++++++----------
 drivers/net/wireless/mac80211/rt2x00/rt73usb.h     |   43 +-
 21 files changed, 2363 insertions(+), 2844 deletions(-)
 create mode 100644 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.h

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Finally the 2.0.3 release of rt2x00 is here :)

And as promised since actually contains bugfixes
The hightlights are a working link tuner which finally
makes sure all drivers come close to being actually
useable.

Also a small change in statistics, rt2x00 will now only report the RSSI to mac80211.
The reporting of Noise values have been removed,
since rt2x00 cannot measure the noise and previously
reported the sensitivity value determined by the link_tuner.
And I am not completely sure if that is a desired behavior, since the preference
would be a measured value I guess.

Also I still have to determine what a good value for the Signal reporting
should be. With only a RSSI reporting I feel rt2x00 isn't reporting all that it can...

Ivo

---

The following changes since commit a7008e4ecc4ec69a9868105ce7f805a6ab486d69:
  Johannes Berg (1):
        mac80211: regdomain.c needs to include ieee80211_i.h

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ master

Adam Baker (1):
      rt2x00: Set Maximum sensitivity when not receiving

Ivo van Doorn (42):
      rt2x00: Remove usage of open and stop callbacks
      rt2x00: Fix rfkill compilation
      rt2x00: rfkill should use input_poll device
      rt2x00: Fix promisc mode check
      rt2x00: Put debugfs_intf inbetween DEBUGFS defines
      rt2x00: Cleanup debug messages
      rt2x00: Remove ENTRY_TXD_NEW_SEQ flag
      rt2x00: Remove DRV_NAME define from rt2x00.h
      rt2x00: Remove device & mac_addr fields
      rt2x00: Use the mac80211 provided workqueue
      rt2x00: Don't wake device on resume
      rt2x00: Move interrupt toggling into seperate function
      rt2x00: Round LINK_TUNER_INTERVAL up
      rt2x00: Set the IEEE80211_HW_NO_PROBE_FILTERING flag
      rt2x00: Add rt2570 chipset revisions
      rt2x00: Split TXD_ENTRY_AVAILABLE
      rt2x00: rt61 should check the CIPHER_ERROR bit
      rt2x00: Fix reporting false rate during rx
      rt2x00: Correctly exit the firmware load function
      rt2x00: Fix link tuner limitation for rt2400pci
      rt2x00: Cleanup Kconfig dependencies and selects
      rt2x00: Defer firmware loading untill ifup
      rt2x00: Change register definition ordering
      rt2x00: Correctly initialize PSCSR2 in rt2400.
      rt2x00: Introduce the walking average
      rt2x00: Remove noise reporting
      rt2x00: Fix RSSI value reading / reporting / link tuning
      rt2x00: Use prefetch for ring loop
      rt2x00: Use the register field defines
      rt2x00: Move initialization of rings into rt2x00usb
      rt2x00: Move usb_interrupt_rxdone into rt2x00usb
      rt2x00: Fix RX skb allocation
      rt2x00: KConfig layout correction
      rt2x00: Set DEVICE_ENABLED_RADIO_HW when rfkill is disabled
      rt2x00: Change word argument for debug_access_t
      rt2x00: Suspend/Resume Don't register/reregister device
      Merge branch 'wireless-dev'
      rt2x00: Fix CTS frame requirement detection
      rt2x00: Don't cut FCS in RX frames
      rt2x00: Use delayed_work_pending
      rt2x00: Don't enable/disable link tuner twice
      rt2x00: Release 2.0.3

 drivers/net/wireless/mac80211/rt2x00/Kconfig       |   91 ++++----
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c   |  167 ++++++-------
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.h   |   45 ++--
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.c   |  191 +++++++-------
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.h   |   54 +++--
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.c   |  176 ++++---------
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.h   |   61 +++--
 drivers/net/wireless/mac80211/rt2x00/rt2x00.h      |  141 +++++++----
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h |    2 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c   |   86 +------
 .../net/wireless/mac80211/rt2x00/rt2x00firmware.c  |   77 ++----
 .../net/wireless/mac80211/rt2x00/rt2x00firmware.h  |    6 -
 drivers/net/wireless/mac80211/rt2x00/rt2x00lib.h   |    7 -
 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c   |  131 ++++------
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c   |   52 ++++-
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.h   |   16 +-
 .../net/wireless/mac80211/rt2x00/rt2x00rfkill.c    |   62 +++--
 .../net/wireless/mac80211/rt2x00/rt2x00rfkill.h    |    7 +
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c   |  156 +++++++++---
 drivers/net/wireless/mac80211/rt2x00/rt61pci.c     |  264 +++++++++++++-------
 drivers/net/wireless/mac80211/rt2x00/rt61pci.h     |   77 ++++--
 drivers/net/wireless/mac80211/rt2x00/rt73usb.c     |  242 ++++++++++---------
 drivers/net/wireless/mac80211/rt2x00/rt73usb.h     |   81 ++++---
 23 files changed, 1166 insertions(+), 1026 deletions(-)

Re: Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi,

One additional note I forgot to mention:

> The following changes since commit a7008e4ecc4ec69a9868105ce7f805a6ab486d69:
>   Johannes Berg (1):
>         mac80211: regdomain.c needs to include ieee80211_i.h
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ master

Please note the new location of the Git repository ;)
Because of problems with the git.serialmonkey repository
we have now moved to git.kernel.org. :)

Ivo

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Today a very quick release of 2.0.4,
reason for this quick followup on 2.0.3 are the fixes
regarding the USB ID and the rt61pci interrupts.

The latter one (hopefully) resolves an bugreport recently
raised in the Fedora Bugzilla. (I'll update the report in a few seconds)

And yes I have read the mails of today regarding patch submissions,
so I'll start sending the individual patches as well along with this pull request. ;)

Short note about the state of rt2x00:
  - Code cleaning is progressing, next version will probably contain
    the result of Lindent run. But after that I don't expect big changes regarding
    code style.

  - Writing "Magical" values to the registers has been reduced as much as possible,
    most values that are still magical are really magic and I have no clue on what they
    exactly mean, except that those values should be written. ;)

  - Suspend/resume is completely broken. I am not sure how the device should
    correctly suspend/resume. Most important points on this area are
    deregistering/registering ieee80211_hw and reassociation after resume.
    I am gathering some more info on this, and will post a bigger report on the mailinglist
    in a few days.

  - Statistics reading. Noise and Signal are still empty...
    It would really be nice to have some value to report for these statistics.

  - Bug reports show definite progress, rt2x00 doesn't really seem to break things,
    but neither is it doing a usefull things...

Ivo

---

The following changes since commit 9cc4f5142dd983d178b158e782d5e60900e48270:
  Michael Wu (1):
        mac80211: use more GFP_KERNEL instead of GFP_ATOMIC

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Adam Baker (1):
      rt2x00: Don't export unneeded symbols

Ivo van Doorn (13):
      rt2x00: Check permissions on debugfs write
      Merge branch 'wireless-dev'
      rt2x00: Use rts_cts_rate for CTS frames
      rt2x00: Cleanup allocation/initialization
      rt2x00: rt61pci interrupts are called on MCU CMD done
      rt2x00: Reduce requirement for debugfs wrapper functions
      rt2x00: Don't toggle promisc mode in link_tuner
      rt2x00: Fix MAC address initialization for multiple interfaces
      Merge branch 'wireless-dev'
      rt2x00: Check for all errors on RXdone
      rt2x00: Parse chipset revision for RT chip validation
      rt2x00: Release 2.0.4
      Merge branch 'wireless-dev'

 drivers/net/wireless/mac80211/rt2x00/rt2400pci.c   |   83 +--
 drivers/net/wireless/mac80211/rt2x00/rt2400pci.h   |    2 +-
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.c   |   90 +---
 drivers/net/wireless/mac80211/rt2x00/rt2500pci.h   |    2 +-
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.c   |  105 ++---
 drivers/net/wireless/mac80211/rt2x00/rt2500usb.h   |    4 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00.h      |   17 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.c |  237 +++------
 drivers/net/wireless/mac80211/rt2x00/rt2x00debug.h |   27 +-
 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.c   |  560 ++++++++++----------
 drivers/net/wireless/mac80211/rt2x00/rt2x00dev.h   |    1 -
 drivers/net/wireless/mac80211/rt2x00/rt2x00mac.c   |   57 ++-
 drivers/net/wireless/mac80211/rt2x00/rt2x00pci.c   |   58 ++-
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.c   |  126 +++--
 drivers/net/wireless/mac80211/rt2x00/rt2x00usb.h   |    1 -
 drivers/net/wireless/mac80211/rt2x00/rt61pci.c     |   99 ++---
 drivers/net/wireless/mac80211/rt2x00/rt61pci.h     |    2 +-
 drivers/net/wireless/mac80211/rt2x00/rt73usb.c     |  100 ++---
 drivers/net/wireless/mac80211/rt2x00/rt73usb.h     |    2 +-
 19 files changed, 731 insertions(+), 842 deletions(-)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is a new release of rt2x00: 2.0.5
Don't let the 25 patches fool you, there are 2 _very_ big patches among them. ;)
The 2 biggest are (as announced earlier) the results of a Lindent run,
and the result of a code cleanup. After those 2 patches the code is hopefully
clean enough to be accepted upstream when rt2x00 is a bit more stable.
In any case further code cleanup patches won't/shouldn't be so big anymore.

Some interesting features in this release:
 - rt73usb no longer crashes in adhoc mode (But neither does it work)
 - rf registers can now be read/written through debugfs
 - Monitor interfaces should now capture everything
 - Signal reporting
 - Correct suspend/resume handling

Ivo

---

The following changes since commit 6e46e62d22ed4b5282d3b9592483e901a9f2643f:
  Zhu Yi (1):
        iwlwifi: update version stamp to 0.1.5

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Ivo van Doorn (25):
      rt2x00: Remove rt73usb_get_tsf
      rt2x00: Put rf register value detection in function
      rt2x00: Don't toggle tuner bit for non-RF2523 chips
      rt2x00: Add reset_tuner handler
      rt2x00: rt2500usb needs to reset BBP 24, 25 and 61
      rt2x00: Cleanup RF register reading/writing
      rt2x00: Add RF register contents to Debugfs
      rt2x00: Fix invalid RF array reading
      rt2x00: Increase RF_SIZE
      rt2x00: rt2x00pci should use rf_size
      rt2x00: Correctly handle RF 0 writing
      rt2x00: Rename init_hw -> probe_hw
      rt2x00: Move interface init/deinit into rt2x00dev
      rt2x00: Fix interface opening/closing on suspend/resume
      rt2x00: Lindent
      rt2x00: Call all configure handlers during resume
      rt2x00: Big rt2x00 cleanup
      rt2x00: Add Multicast/Broadcast filtering
      rt2x00: Include <linux/delay.h>
      rt2x00: Periodically read statistics
      rt2x00: Don't check for preamble in RXdone
      rt2x00: Configure type during add_interface
      rt2x00: Add Signal reporting
      rt2x00: rt2x00 2.0.5
      Merge branch 'wireless-dev'

 drivers/net/wireless/Makefile         |    2 +-
 drivers/net/wireless/rt2400pci.c      |  620 +++++++++++----------
 drivers/net/wireless/rt2400pci.h      |    3 +-
 drivers/net/wireless/rt2500pci.c      |  695 +++++++++++++-----------
 drivers/net/wireless/rt2500pci.h      |    2 +
 drivers/net/wireless/rt2500usb.c      |  686 +++++++++++++-----------
 drivers/net/wireless/rt2500usb.h      |   35 +-
 drivers/net/wireless/rt2x00.h         |  861 +++++++++---------------------
 drivers/net/wireless/rt2x00config.c   |  177 ++++++
 drivers/net/wireless/rt2x00debug.c    |  101 +++--
 drivers/net/wireless/rt2x00debug.h    |   32 +-
 drivers/net/wireless/rt2x00dev.c      |  470 +++++++++++------
 drivers/net/wireless/rt2x00dev.h      |   59 --
 drivers/net/wireless/rt2x00firmware.c |   45 +-
 drivers/net/wireless/rt2x00firmware.h |   43 --
 drivers/net/wireless/rt2x00lib.h      |  137 +++---
 drivers/net/wireless/rt2x00mac.c      |  283 +++++-----
 drivers/net/wireless/rt2x00pci.c      |  140 +++--
 drivers/net/wireless/rt2x00pci.h      |   38 +-
 drivers/net/wireless/rt2x00reg.h      |  270 +++++++++
 drivers/net/wireless/rt2x00rfkill.c   |   41 +-
 drivers/net/wireless/rt2x00rfkill.h   |   58 --
 drivers/net/wireless/rt2x00ring.h     |  242 ++++++++
 drivers/net/wireless/rt2x00usb.c      |  177 ++++---
 drivers/net/wireless/rt2x00usb.h      |   40 +-
 drivers/net/wireless/rt61pci.c        |  966 +++++++++++++++++----------------
 drivers/net/wireless/rt61pci.h        |    3 +-
 drivers/net/wireless/rt73usb.c        |  870 ++++++++++++++++--------------
 drivers/net/wireless/rt73usb.h        |    3 +-
 29 files changed, 3870 insertions(+), 3229 deletions(-)
 create mode 100644 drivers/net/wireless/rt2x00config.c
 delete mode 100644 drivers/net/wireless/rt2x00dev.h
 delete mode 100644 drivers/net/wireless/rt2x00firmware.h
 create mode 100644 drivers/net/wireless/rt2x00reg.h
 delete mode 100644 drivers/net/wireless/rt2x00rfkill.h
 create mode 100644 drivers/net/wireless/rt2x00ring.h

Re: Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Thanks for the quick pull on rt2x00.git,
but I have a short question:

> Ivo van Doorn (25):
>       rt2x00: Remove rt73usb_get_tsf
>       rt2x00: Put rf register value detection in function
>       rt2x00: Don't toggle tuner bit for non-RF2523 chips
>       rt2x00: Add reset_tuner handler
>       rt2x00: rt2500usb needs to reset BBP 24, 25 and 61
>       rt2x00: Cleanup RF register reading/writing
>       rt2x00: Add RF register contents to Debugfs
>       rt2x00: Fix invalid RF array reading
>       rt2x00: Increase RF_SIZE
>       rt2x00: rt2x00pci should use rf_size
>       rt2x00: Correctly handle RF 0 writing
>       rt2x00: Rename init_hw -> probe_hw
>       rt2x00: Move interface init/deinit into rt2x00dev
>       rt2x00: Fix interface opening/closing on suspend/resume
>       rt2x00: Lindent
>       rt2x00: Call all configure handlers during resume
>       rt2x00: Big rt2x00 cleanup
>       rt2x00: Add Multicast/Broadcast filtering
>       rt2x00: Include <linux/delay.h>
>       rt2x00: Periodically read statistics
>       rt2x00: Don't check for preamble in RXdone
>       rt2x00: Configure type during add_interface
>       rt2x00: Add Signal reporting

The above have been merged nicely,
but where did the following patch go to?

>       rt2x00: rt2x00 2.0.5

Was this intentionally dropped,
or was there a weird git problem somewhere?

Thanks,

Ivo

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is rt2x00 version 2.0.6,
unfortunately 2.0.5 was broken and unusable.

Problem has been found and fixed, so together with
some other small changes here is 2.0.6 :)

This one should be safe to be merged with FC kernels. ;)

Ivo

---

The following changes since commit 515c4dbee8271ff66fde61304309b1992e430502:
  John W. Linville (1):
        Merge branch 'upstream' of git://git.kernel.org/.../ivd/rt2x00

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Ivo van Doorn (7):
      Merge branch 'wireless-dev'
      rt2x00: Add new USB ID for Buffalo rt73usb
      rt2x00: Update rssi before signal calculation
      rt2x00: Return 0 when the offset != 0
      rt2x00: rt2x00lib_config_mac_addr should call config_mac
      rt2x00: Release rt2x00 2.0.6
      Merge branch 'wireless-dev'

 drivers/net/wireless/rt2x00.h       |    2 +-
 drivers/net/wireless/rt2x00config.c |    4 ++--
 drivers/net/wireless/rt2x00debug.c  |    6 ++++++
 drivers/net/wireless/rt2x00dev.c    |    2 +-
 drivers/net/wireless/rt73usb.c      |    2 ++
 5 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/rt2x00.h b/drivers/net/wireless/rt2x00.h
index c5c1773..77556fe 100644
--- a/drivers/net/wireless/rt2x00.h
+++ b/drivers/net/wireless/rt2x00.h
@@ -41,7 +41,7 @@
  * Module information.
  * DRV_NAME should be set within the individual module source files.
  */
-#define DRV_VERSION	"2.0.5"
+#define DRV_VERSION	"2.0.6"
 #define DRV_PROJECT	"http://rt2x00.serialmonkey.com"
 
 /*
diff --git a/drivers/net/wireless/rt2x00config.c b/drivers/net/wireless/rt2x00config.c
index 3733a84..11d5646 100644
--- a/drivers/net/wireless/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00config.c
@@ -37,13 +37,13 @@
 void rt2x00lib_config_mac_addr(struct rt2x00_dev *rt2x00dev, u8 *mac)
 {
 	if (mac)
-		rt2x00dev->ops->lib->config_bssid(rt2x00dev, mac);
+		rt2x00dev->ops->lib->config_mac_addr(rt2x00dev, mac);
 }
 
 void rt2x00lib_config_bssid(struct rt2x00_dev *rt2x00dev, u8 *bssid)
 {
 	if (bssid)
-		rt2x00dev->ops->lib->config_mac_addr(rt2x00dev, bssid);
+		rt2x00dev->ops->lib->config_bssid(rt2x00dev, bssid);
 }
 
 void rt2x00lib_config_packet_filter(struct rt2x00_dev *rt2x00dev, int filter)
diff --git a/drivers/net/wireless/rt2x00debug.c b/drivers/net/wireless/rt2x00debug.c
index ffc95bb..d6c4cfe 100644
--- a/drivers/net/wireless/rt2x00debug.c
+++ b/drivers/net/wireless/rt2x00debug.c
@@ -124,6 +124,9 @@ static ssize_t rt2x00debug_read_##__name(struct file *file,	\
 	size_t size;						\
 	__type value;						\
 								\
+	if (*offset)						\
+		return 0;					\
+								\
 	if (intf->offset_##__name > debug->__name.word_count)	\
 		return -EINVAL;					\
 								\
@@ -151,6 +154,9 @@ static ssize_t rt2x00debug_write_##__name(struct file *file,	\
 	size_t size;						\
 	__type value;						\
 								\
+	if (*offset)						\
+		return 0;					\
+								\
 	if (!capable(CAP_NET_ADMIN))				\
 		return -EPERM;					\
 								\
diff --git a/drivers/net/wireless/rt2x00dev.c b/drivers/net/wireless/rt2x00dev.c
index a584fbe..28ddbe0 100644
--- a/drivers/net/wireless/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00dev.c
@@ -349,11 +349,11 @@ void rt2x00lib_rxdone(struct data_entry *entry, char *data,
 		}
 	}
 
+	rt2x00_update_link_rssi(&rt2x00dev->link, rssi);
 	rt2x00dev->link.rx_success++;
 	rx_status->rate = val;
 	rx_status->signal = rt2x00lib_calculate_link_signal(rt2x00dev);
 	rx_status->ssi = rssi;
-	rt2x00_update_link_rssi(&rt2x00dev->link, rssi);
 
 	/*
 	 * Let's allocate a sk_buff where we can store the received data in,
diff --git a/drivers/net/wireless/rt73usb.c b/drivers/net/wireless/rt73usb.c
index 48fb38e..2f0bf29 100644
--- a/drivers/net/wireless/rt73usb.c
+++ b/drivers/net/wireless/rt73usb.c
@@ -1884,6 +1884,8 @@ static struct usb_device_id rt73usb_device_table[] = {
 	{ USB_DEVICE(0x050d, 0x905b), USB_DEVICE_DATA(&rt73usb_ops) },
 	/* Billionton */
 	{ USB_DEVICE(0x1631, 0xc019), USB_DEVICE_DATA(&rt73usb_ops) },
+	/* Buffalo */
+	{ USB_DEVICE(0x0411, 0x00f4), USB_DEVICE_DATA(&rt73usb_ops) },
 	/* CNet */
 	{ USB_DEVICE(0x1371, 0x9022), USB_DEVICE_DATA(&rt73usb_ops) },
 	{ USB_DEVICE(0x1371, 0x9032), USB_DEVICE_DATA(&rt73usb_ops) },

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Well finally rt2x00 2.0.7 is released, unfortunately it will
not be the last release in the 2.0.* series as promised earlier.

This series contains lots of bugfixes, but some of the more
critical issues are still present. rt2x00 is however becoming
more usable for more people, so the progress is there. ;)

I'll do my best to make the next release 2.0.8 the last in the
2.0.* series so 2.1.0 can be moved upstream. :)

Ivo

---
The following changes since commit f5a420590f3f6a45ee5bca0048640f0f24852315:
  John W. Linville (1):
        Merge branch 'b43' into everything

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Ivo van Doorn (27):
      rt2x00: Correctly configure packet filter in monitor mode
      rt2x00: Clear MAC and BSSID when non-monitor interface goes down
      rt2x00: Check return value of usb_control_msg()
      rt2x00: Clear all fields on start_link_tune()
      rt2x00: Don't increase rx_failed for individual frames
      rt2x00: Set vgc_level during reset_tuner
      rt2x00: Schedule beacon update
      rt2x00: Be consistent with unsigned
      rt2x00: Correctly reset TX/RX success/failed counters
      rt2x00: Rework RF register handling
      rt2x00: rt2x00_ring_free returns invalid length
      rt2x00: Use caching for USB transfers
      rt2x00: Cleanup set_state for rt61 and rt73
      rt2x00: Fix register initialization ordering
      rt2x00: memset descriptor before use
      rt2x00: Remove IEEE80211_HW_WEP_INCLUDE_IV flag
      rt2x00: Cleanup TXD flags
      rt2x00: Add byte-ordering annotation for MAC and BSSID
      rt2x00: Correctly set TXD retry flag
      rt2x00: Move rt2x00 files into rt2x00 folder
      rt2x00: Add file pattern to MAINTAINER entry
      rt2x00: Fix PLCP setup
      rt2x00: Clean up RATEMASK handling
      rt2x00: Add rt2x00lib_reset_link_tuner()
      rt2x00: Always check if mac80211 requested TX status update
      rt2x00: Lindent
      rt2x00: rt2x00 2.0.7

Luca Tettamanti (1):
      Fix off-by-one error in debugfs helpers

Mattias Nissler (2):
      rt2x00: Fix width of filter field.
      rt2x00: Store firmware in memory

 MAINTAINERS                                        |    1 +
 drivers/net/wireless/Kconfig                       |  131 +------
 drivers/net/wireless/Makefile                      |   23 +-
 drivers/net/wireless/rt2x00/Kconfig                |  130 ++++++
 drivers/net/wireless/rt2x00/Makefile               |   22 +
 drivers/net/wireless/{ => rt2x00}/rt2400pci.c      |  149 ++++---
 drivers/net/wireless/{ => rt2x00}/rt2400pci.h      |    0 
 drivers/net/wireless/{ => rt2x00}/rt2500pci.c      |  409 ++++++++++--------
 drivers/net/wireless/{ => rt2x00}/rt2500pci.h      |    0 
 drivers/net/wireless/{ => rt2x00}/rt2500usb.c      |  382 +++++++++-------
 drivers/net/wireless/{ => rt2x00}/rt2500usb.h      |    0 
 drivers/net/wireless/{ => rt2x00}/rt2x00.h         |   56 ++-
 drivers/net/wireless/{ => rt2x00}/rt2x00config.c   |   14 +-
 drivers/net/wireless/{ => rt2x00}/rt2x00debug.c    |   23 +-
 drivers/net/wireless/{ => rt2x00}/rt2x00debug.h    |    0 
 drivers/net/wireless/{ => rt2x00}/rt2x00dev.c      |  221 ++++++----
 drivers/net/wireless/{ => rt2x00}/rt2x00firmware.c |   43 ++-
 drivers/net/wireless/{ => rt2x00}/rt2x00lib.h      |    5 +
 drivers/net/wireless/{ => rt2x00}/rt2x00mac.c      |   15 +-
 drivers/net/wireless/{ => rt2x00}/rt2x00pci.c      |    7 +-
 drivers/net/wireless/{ => rt2x00}/rt2x00pci.h      |    0 
 drivers/net/wireless/{ => rt2x00}/rt2x00reg.h      |   56 ++-
 drivers/net/wireless/{ => rt2x00}/rt2x00rfkill.c   |    0 
 drivers/net/wireless/{ => rt2x00}/rt2x00ring.h     |    6 +-
 drivers/net/wireless/{ => rt2x00}/rt2x00usb.c      |  114 ++++-
 drivers/net/wireless/{ => rt2x00}/rt2x00usb.h      |   60 +++-
 drivers/net/wireless/{ => rt2x00}/rt61pci.c        |  466 ++++++++------------
 drivers/net/wireless/{ => rt2x00}/rt61pci.h        |    0 
 drivers/net/wireless/{ => rt2x00}/rt73usb.c        |  471 +++++++++++---------
 drivers/net/wireless/{ => rt2x00}/rt73usb.h        |    0 
 30 files changed, 1532 insertions(+), 1272 deletions(-)
 create mode 100644 drivers/net/wireless/rt2x00/Kconfig
 create mode 100644 drivers/net/wireless/rt2x00/Makefile
 rename drivers/net/wireless/{ => rt2x00}/rt2400pci.c (94%)
 rename drivers/net/wireless/{ => rt2x00}/rt2400pci.h (100%)
 rename drivers/net/wireless/{ => rt2x00}/rt2500pci.c (84%)
 rename drivers/net/wireless/{ => rt2x00}/rt2500pci.h (100%)
 rename drivers/net/wireless/{ => rt2x00}/rt2500usb.c (81%)
 rename drivers/net/wireless/{ => rt2x00}/rt2500usb.h (100%)
 rename drivers/net/wireless/{ => rt2x00}/rt2x00.h (94%)
 rename drivers/net/wireless/{ => rt2x00}/rt2x00config.c (92%)
 rename drivers/net/wireless/{ => rt2x00}/rt2x00debug.c (94%)
 rename drivers/net/wireless/{ => rt2x00}/rt2x00debug.h (100%)
 rename drivers/net/wireless/{ => rt2x00}/rt2x00dev.c (85%)
 rename drivers/net/wireless/{ => rt2x00}/rt2x00firmware.c (84%)
 rename drivers/net/wireless/{ => rt2x00}/rt2x00lib.h (94%)
 rename drivers/net/wireless/{ => rt2x00}/rt2x00mac.c (97%)
 rename drivers/net/wireless/{ => rt2x00}/rt2x00pci.c (98%)
 rename drivers/net/wireless/{ => rt2x00}/rt2x00pci.h (100%)
 rename drivers/net/wireless/{ => rt2x00}/rt2x00reg.h (80%)
 rename drivers/net/wireless/{ => rt2x00}/rt2x00rfkill.c (100%)
 rename drivers/net/wireless/{ => rt2x00}/rt2x00ring.h (96%)
 rename drivers/net/wireless/{ => rt2x00}/rt2x00usb.c (85%)
 rename drivers/net/wireless/{ => rt2x00}/rt2x00usb.h (65%)
 rename drivers/net/wireless/{ => rt2x00}/rt61pci.c (89%)
 rename drivers/net/wireless/{ => rt2x00}/rt61pci.h (100%)
 rename drivers/net/wireless/{ => rt2x00}/rt73usb.c (82%)
 rename drivers/net/wireless/{ => rt2x00}/rt73usb.h (100%)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

It has taken some time to finally release this,
but it contains quite a lot of bugfixes of variating impact.

Overall the stability has been greatly improved,
although there are still some nasty bugs in there.

Note that even after this update rt2x00 in wireless-dev will still not work
for encrypted networks. This is because rt2x00 depends on the encryption
patches by Johannes which are pending for wireless-dev inclusion
(Most notably the patch that fixes the IEEE80211_HW_WEP_INCLUDE_IV
behavior is required to make it work again).

Ivo

---

The following changes since commit e6d77b902151278df6a670b460a32e7cc6b75e9e:
  Luis R. Rodriguez (1):
        Merge branch 'ath5k' into everything

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Ivo van Doorn (24):
      rt2x00: Remove firmware not-NULL check
      rt2x00: Don't check for IEEE80211_TXCTL_REQ_TX_STATUS
      rt2x00: Cleanup rxdone
      rt2x00: Don't allow configuration calls when uninitialized
      rt2x00: Fix rt61pci and rt73usb beacon handling
      rt2x00: Recalculate link quality
      rt2x00: Cleanup entry->flags
      rt2x00: Reduce LNA flags
      rt2x00: Rework RT61 and RT73 Antenna handling
      rt2x00: Rename DEVICE_SUPPORT_ATIM to REQUIRE_BEACON_RING
      rt2x00: Remove rt2x00mac_reset()
      rt2x00: Fix system freeze on device removal
      rt2x00: Reduce magic value writing to device
      rt2x00: New USB ID's for rt73usb and rt2500usb
      rt2x00: Beacon ring entries should have QID_MGMT
      rt2x00: Fix DEV_RATEBIT_ definitions
      rt2x00: Fix rfkill handling
      rt2x00: Merge allocation/free register components
      rt2x00: macro's shouldn't use hidden arguments
      rt2x00: Fix channel initialization
      rt2x00: Add better CONFIG_PM checks
      rt2x00: Add start/stop handlers
      rt2x00: Add additional bit to MAX_FRAME_UNIT
      rt2x00: Release rt2x00 2.0.8

 drivers/net/wireless/rt2x00/rt2400pci.c      |   37 +-
 drivers/net/wireless/rt2x00/rt2500pci.c      |   83 +++--
 drivers/net/wireless/rt2x00/rt2500pci.h      |   40 ++-
 drivers/net/wireless/rt2x00/rt2500usb.c      |  208 ++++++++--
 drivers/net/wireless/rt2x00/rt2500usb.h      |   39 ++-
 drivers/net/wireless/rt2x00/rt2x00.h         |   47 ++-
 drivers/net/wireless/rt2x00/rt2x00config.c   |   12 +-
 drivers/net/wireless/rt2x00/rt2x00debug.c    |   26 +-
 drivers/net/wireless/rt2x00/rt2x00dev.c      |  308 ++++++--------
 drivers/net/wireless/rt2x00/rt2x00firmware.c |    6 +-
 drivers/net/wireless/rt2x00/rt2x00lib.h      |    4 +-
 drivers/net/wireless/rt2x00/rt2x00mac.c      |  111 ++++--
 drivers/net/wireless/rt2x00/rt2x00pci.c      |  127 ++----
 drivers/net/wireless/rt2x00/rt2x00pci.h      |    3 +
 drivers/net/wireless/rt2x00/rt2x00reg.h      |   27 +-
 drivers/net/wireless/rt2x00/rt2x00rfkill.c   |    6 +-
 drivers/net/wireless/rt2x00/rt2x00ring.h     |   29 +-
 drivers/net/wireless/rt2x00/rt2x00usb.c      |  235 +++--------
 drivers/net/wireless/rt2x00/rt2x00usb.h      |    9 +-
 drivers/net/wireless/rt2x00/rt61pci.c        |  617 ++++++++++++++++++--------
 drivers/net/wireless/rt2x00/rt61pci.h        |   87 ++++-
 drivers/net/wireless/rt2x00/rt73usb.c        |  471 +++++++++++++-------
 drivers/net/wireless/rt2x00/rt73usb.h        |   65 +++-
 23 files changed, 1615 insertions(+), 982 deletions(-)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

(Finally) the rt2x00 2.0.9 release containing the patches
for the API changes from the mac80211-misc git tree.

NOTE: currently rt2x00.git is branched off from the mac80211-misc
tree to make the porting easier and to allow early testing.
So you might want to pull that tree before pulling rt2x00.

This release contains several bug fixes especially some kernel
panics during rmmod have been fixed by Modestas Vainius.

---

The following changes since commit 4cceb887147261d7fd9fe7ce3b6d6f236c8300bc:
  Michael Wu (1):
        adm8211: Adapt to filter configuration API

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Ivo van Doorn (11):
      rt2x00: Correct error in calculating rssi for link tuner
      rt2x00: Make *_beacon_update static
      rt2x00: Increase rt2x00usb_vendor_request timeout.
      rt2x00: Correctly identify rt2561turbo
      rt2x00: adapt to filter configuration API
      rt2x00: Reorganize rt2x00dev->flags
      rt2x00: Add rt2x00dev->flags to debugfs
      rt2x00: Stop link tuning when radio is down
      rt2x00: Fix obvious typo in comment
      rt2x00: Fix panic on rmmod with rfkill enabled
      rt2x00: Release rt2x00 2.0.9

Modestas Vainius (1):
      rt2x00: make rt2x00lib_stop_link_tuner() reentrant with link_tuner work

 drivers/net/wireless/rt2x00/rt2400pci.c    |  159 +++++++++++++-----------
 drivers/net/wireless/rt2x00/rt2500pci.c    |  171 ++++++++++++++------------
 drivers/net/wireless/rt2x00/rt2500usb.c    |  181 ++++++++++++++++------------
 drivers/net/wireless/rt2x00/rt2x00.h       |   70 ++++-------
 drivers/net/wireless/rt2x00/rt2x00config.c |   75 +-----------
 drivers/net/wireless/rt2x00/rt2x00debug.c  |   37 ++++++
 drivers/net/wireless/rt2x00/rt2x00dev.c    |  109 +++++++++++++-----
 drivers/net/wireless/rt2x00/rt2x00lib.h    |    4 +-
 drivers/net/wireless/rt2x00/rt2x00mac.c    |  155 ++++++++----------------
 drivers/net/wireless/rt2x00/rt2x00pci.c    |   31 ++---
 drivers/net/wireless/rt2x00/rt2x00rfkill.c |   14 +--
 drivers/net/wireless/rt2x00/rt2x00ring.h   |   17 +++-
 drivers/net/wireless/rt2x00/rt2x00usb.c    |   26 ++---
 drivers/net/wireless/rt2x00/rt2x00usb.h    |    8 +-
 drivers/net/wireless/rt2x00/rt61pci.c      |  172 ++++++++++++++------------
 drivers/net/wireless/rt2x00/rt73usb.c      |  179 ++++++++++++++++------------
 drivers/net/wireless/rt2x00/rt73usb.h      |    2 +-
 17 files changed, 728 insertions(+), 682 deletions(-)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is the rt2x00 2.0.10 update.
Some obvious bugs have been fixed, some not so obvious bugs,
and the code has been cleaned up a bit by moving more
into rt2x00lib.

Note that as of now rt2x00.git will be branched from the wireless-2.6
git tree. I see wireless-dev has already been removed/renamed so
I won't be using that anymore. ;)

All indivual patches can also be found here:
http://kernel.org//pub/linux/kernel/people/ivd/rt2x00-2.0.10/

Ivo

---

The following changes since commit f88cf9b6d7c8dad6eb64a972a753584b8006c545:
  John W. Linville (1):
        zd1211rw-mac80211: undo print_mac API stuff

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Ivo van Doorn (16):
      rt2x00: Remove duplicate code in MAC & BSSID handling
      rt2x00: Remove radio check from rt2x00lib_toggle_rx
      rt2x00: Store "STARTED" state during suspend
      rt2x00: Move rt2x00dev flags into enumeration
      rt2x00: Don't use changed_flags inside configure_packet_filter
      rt2x00: Fix rfkill handling
      rt2x00: Move TSF sync values into rt2x00config
      rt2x00: get_duration expects values in 100kbs
      rt2x00: Cut lines down to 80 characters
      rt2x00: Add get_tx_data_len callback function
      rt2x00: Pass dev_state to rt2x00lib_toggle_rx
      rt2x00: Small optimizations
      rt2x00: Reorganize configuration handler
      rt2x00: Clean disabling of rt73usb_get_tsf
      rt2x00: Allways memset memory obtained from skb_push()
      rt2x00: Release 2.0.10

 drivers/net/wireless/rt2x00/rt2400pci.c    |  186 ++++++++++----------------
 drivers/net/wireless/rt2x00/rt2500pci.c    |  201 +++++++++++-----------------
 drivers/net/wireless/rt2x00/rt2500usb.c    |  200 ++++++++++++----------------
 drivers/net/wireless/rt2x00/rt2x00.h       |   93 ++++++++++---
 drivers/net/wireless/rt2x00/rt2x00config.c |  113 +++++++++++++++-
 drivers/net/wireless/rt2x00/rt2x00dev.c    |   52 +++++---
 drivers/net/wireless/rt2x00/rt2x00lib.h    |   14 +--
 drivers/net/wireless/rt2x00/rt2x00mac.c    |   38 +++++-
 drivers/net/wireless/rt2x00/rt2x00reg.h    |    9 ++
 drivers/net/wireless/rt2x00/rt2x00rfkill.c |    4 +-
 drivers/net/wireless/rt2x00/rt2x00usb.c    |   29 +++--
 drivers/net/wireless/rt2x00/rt61pci.c      |  166 +++++++----------------
 drivers/net/wireless/rt2x00/rt73usb.c      |  195 +++++++++++----------------
 13 files changed, 642 insertions(+), 658 deletions(-)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is the rt2x00 2.0.11 update.
Highlights for this release are the fix for the TX problems,
and the implementation of the Software Diversity Antenna.

All indivual patches can also be found here:
http://kernel.org//pub/linux/kernel/people/ivd/rt2x00-2.0.11/

Ivo

---

The following changes since commit 2d46d1e00056de79e54c622a60f7e6f8818f6cb4:
  Mattias Nissler (1):
        mac80211: Defer setting of RX_FLAG_DECRYPTED.

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Ivo van Doorn (9):
      rt2x00: Move quality statistics into seperate structure
      rt2x00: Use enum defines
      rt2x00: Correctly translate mac80211 antenna setup to rt2x00
      rt2x00: SW diversity should default to antenna B
      rt2x00: Remove rt2x00_clear_link
      rt2x00: Implement SW diversity
      rt2x00: Cleanup if-statements
      rt2x00: Add new rt73usb USB ID
      rt2x00: Release rt2x00 2.0.11

Mattias Nissler (2):
      rt2x00: Fix residual check in PLCP calculations.
      rt2x00: Fix antenna selection.

 drivers/net/wireless/rt2x00/rt2400pci.c    |   80 +++++++-----
 drivers/net/wireless/rt2x00/rt2500pci.c    |   88 ++++++------
 drivers/net/wireless/rt2x00/rt2500usb.c    |   84 +++++++-----
 drivers/net/wireless/rt2x00/rt2500usb.h    |   13 ++-
 drivers/net/wireless/rt2x00/rt2x00.h       |  165 +++++++++++++++++------
 drivers/net/wireless/rt2x00/rt2x00config.c |   85 +++++++++++-
 drivers/net/wireless/rt2x00/rt2x00dev.c    |  201 ++++++++++++++++++++++++----
 drivers/net/wireless/rt2x00/rt2x00lib.h    |    2 +
 drivers/net/wireless/rt2x00/rt61pci.c      |  116 +++++++++--------
 drivers/net/wireless/rt2x00/rt73usb.c      |   87 +++++++------
 10 files changed, 645 insertions(+), 276 deletions(-)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is the 2.0.12 release of rt2x00.
I noticed you only pulled 2 patches from the 2.0.11 release,
and I don't know why you dropped the remaining patches.
This means that this pull requests also contains the remaining
2.0.11 patches...

Lots of bugfixes this time, finally rfkill is working, link speeds issues
have been resolved and some packet loss issues are gone.

All indivual patches can also be found here:
http://kernel.org//pub/linux/kernel/people/ivd/rt2x00-2.0.12/

Ivo

---

The following changes since commit 0119130478b1706232d79c768cb587c5e0c615de:
  John W. Linville (1):
        Merge branch 'fixes-jgarzik' into everything

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Adam Baker (2):
      rt2x00: Unconstify rt2x00dev
      rt2x00: Place mutex around USB register access

Ivo van Doorn (15):
      rt2x00: Move quality statistics into seperate structure
      rt2x00: Use enum defines
      rt2x00: Correctly translate mac80211 antenna setup to rt2x00
      rt2x00: SW diversity should default to antenna B
      rt2x00: Remove rt2x00_clear_link
      rt2x00: Implement SW diversity
      rt2x00: Cleanup if-statements
      rt2x00: Release rt2x00 2.0.11
      rt2x00: Disable RX when switching antenna
      rt2x00: Split rt61/rt73 antenna selection into RX and TX antenna
      rt2x00: Input-polldev requires input device
      rt2x00: Detect initial rfkill state on register
      rt2x00: Remove unused variables
      rt2x00: Remove data_desc structure
      rt2x00: Release rt2x00 2.0.12

Mattias Nissler (4):
      rt2x00: Fix antenna selection.
      rt2x00: Rework rt61 antenna selection.
      rt2x00: Rework rt73 antenna selection
      rt2x00: Correctly set ACK bit in tx descriptors

 drivers/net/wireless/rt2x00/rt2400pci.c    |  104 +++++----
 drivers/net/wireless/rt2x00/rt2400pci.h    |    4 +-
 drivers/net/wireless/rt2x00/rt2500pci.c    |  112 +++++-----
 drivers/net/wireless/rt2x00/rt2500pci.h    |    4 +-
 drivers/net/wireless/rt2x00/rt2500usb.c    |  169 +++++++++-----
 drivers/net/wireless/rt2x00/rt2500usb.h    |   17 ++-
 drivers/net/wireless/rt2x00/rt2x00.h       |  192 ++++++++++++----
 drivers/net/wireless/rt2x00/rt2x00config.c |   95 ++++++++-
 drivers/net/wireless/rt2x00/rt2x00debug.h  |    4 +-
 drivers/net/wireless/rt2x00/rt2x00dev.c    |  212 +++++++++++++++---
 drivers/net/wireless/rt2x00/rt2x00lib.h    |    2 +
 drivers/net/wireless/rt2x00/rt2x00pci.c    |    4 +-
 drivers/net/wireless/rt2x00/rt2x00pci.h    |    8 +-
 drivers/net/wireless/rt2x00/rt2x00rfkill.c |   44 ++++-
 drivers/net/wireless/rt2x00/rt2x00ring.h   |   23 +--
 drivers/net/wireless/rt2x00/rt2x00usb.c    |   38 +++-
 drivers/net/wireless/rt2x00/rt2x00usb.h    |   19 +-
 drivers/net/wireless/rt2x00/rt61pci.c      |  332 ++++++++++++++--------------
 drivers/net/wireless/rt2x00/rt61pci.h      |   14 +-
 drivers/net/wireless/rt2x00/rt73usb.c      |  198 ++++++++++-------
 drivers/net/wireless/rt2x00/rt73usb.h      |   14 +-
 21 files changed, 1071 insertions(+), 538 deletions(-)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is the latest version of rt2x00.

Please merge the patches for 2.6.24
09 - Only update rssi average approximation on receiving beacon frames.
10 - Remove redundant code in rfkill setup
11 - Cleanup rfkill

All other patches can wait for 2.6.25, since they are code cleanups and the
new TX/RX frame dumping facility through debugfs.

Ivo

---

The following changes since commit 301df40749bdf144c72637795ba93d82e4b84682:
  Johannes Berg (1):
        mac80211: remove more forgotten code

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Ivo van Doorn (9):
      rt2x00: Replace DRV_NAME with KBUILD_MODNAME
      rt2x00: Extend PLCP descriptor definition for rt2400pci
      rt2x00: Move register value/offset files into new folder
      rt2x00: Add chipset version to chipset debugfs entry
      rt2x00: Add skb descriptor
      rt2x00: Add TX/RX frame dumping facility
      rt2x00: Use IEEE80211_IF_TYPE_INVALID directly
      rt2x00: Cleanup rfkill
      rt2x00: Release rt2x00 2.0.13

Larry Finger (1):
      rt2x00: Remove redundant code in rfkill setup

Mattias Nissler (1):
      rt2x00: Only update rssi average approximation on receiving beacon frames.

 drivers/net/wireless/rt2x00/rt2400pci.c      |   49 ++----
 drivers/net/wireless/rt2x00/rt2400pci.h      |   20 ++-
 drivers/net/wireless/rt2x00/rt2500pci.c      |    9 +-
 drivers/net/wireless/rt2x00/rt2500usb.c      |   39 +++--
 drivers/net/wireless/rt2x00/rt2x00.h         |   26 ++-
 drivers/net/wireless/rt2x00/rt2x00config.c   |    5 -
 drivers/net/wireless/rt2x00/rt2x00debug.c    |  240 +++++++++++++++++++++++---
 drivers/net/wireless/rt2x00/rt2x00dev.c      |   93 ++++++----
 drivers/net/wireless/rt2x00/rt2x00firmware.c |    5 -
 drivers/net/wireless/rt2x00/rt2x00lib.h      |    6 +
 drivers/net/wireless/rt2x00/rt2x00mac.c      |    7 +-
 drivers/net/wireless/rt2x00/rt2x00pci.c      |   59 +++++--
 drivers/net/wireless/rt2x00/rt2x00rfkill.c   |   15 --
 drivers/net/wireless/rt2x00/rt2x00ring.h     |   22 +++
 drivers/net/wireless/rt2x00/rt2x00usb.c      |   41 +++--
 drivers/net/wireless/rt2x00/rt61pci.c        |   36 +++--
 drivers/net/wireless/rt2x00/rt73usb.c        |   36 +++--
 17 files changed, 484 insertions(+), 224 deletions(-)

Re: Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi,

> Please merge the patches for 2.6.24
> 09 - Only update rssi average approximation on receiving beacon frames.
> 10 - Remove redundant code in rfkill setup
> 11 - Cleanup rfkill

Sorry that should be:
08 - Only update rssi average approximation on receiving beacon frames.
09 - Remove redundant code in rfkill setup
10 - Cleanup rfkill

Ivo

Re: Please pull 'upstream' branch of rt2x00

[John W. Linville]

On Tue, Nov 27, 2007 at 09:54:29PM +0100, Ivo van Doorn wrote:

> > Please merge the patches for 2.6.24

> Sorry that should be:
> 08 - Only update rssi average approximation on receiving beacon frames.
> 09 - Remove redundant code in rfkill setup
> 10 - Cleanup rfkill

Actually it looks to me like 9 and 10 apply to code that isn't in
2.6.24.  8 looks like it is close, but it doesn't quite apply either.
I'll try to massage it in -- hopefully Jeff won't mind the extra
trouble when rebasing...

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

Re: Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

On Thursday 29 November 2007, John W. Linville wrote:
> On Tue, Nov 27, 2007 at 09:54:29PM +0100, Ivo van Doorn wrote:
> 
> > > Please merge the patches for 2.6.24
> 
> > Sorry that should be:
> > 08 - Only update rssi average approximation on receiving beacon frames.
> > 09 - Remove redundant code in rfkill setup
> > 10 - Cleanup rfkill
> 
> Actually it looks to me like 9 and 10 apply to code that isn't in
> 2.6.24.  8 looks like it is close, but it doesn't quite apply either.
> I'll try to massage it in -- hopefully Jeff won't mind the extra
> trouble when rebasing...

9 and 10 should apply cleanly since the rfkill code hasn't changed for quite
some time now. In fact I believe it hasn't changed since the initial merge
to 2.6.24-rc.
Anyway, I'll try to create a patch for the upstream-jgarzik branch this weekend,
that would safe you and jeff some work. :)

Ivo

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is the 2.0.14 release of rt2x00. Again lots of bugfixes,
and unfortunately we are still not there yet. I am afraid
rt2500usb and rt61pci are lost causes for the 2.6.24 release,
they are both broken, and I haven't figured out what is causing
this.

Next release will contain more interesting stuff, most of those
patches are already done, but due to testing and fine tuning I
have kept those patches back for this release. They primarily
cover basic support for virtual interfaces, led triggers, and some
first patches to make rt2x00lib support rt2800 (Yes, work on those
drivers has begun).

All indivual patches can also be found here:
http://kernel.org//pub/linux/kernel/people/ivd/rt2x00-2.0.14/

Ivo

---
The following changes since commit 2d0811f5ed506397d85792abfd8ef0983f4e8b7c:
  John W. Linville (1):
        fixup 'everything' after 'upstream-davem' rebase and patch modification

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Ivo van Doorn (12):
      rt2x00: Fix chipset debugfs file
      rt2x00: Always call ieee80211_stop_queue() when return NETDEV_TX_BUSY
      rt2x00: Only set the TBCN flag when the interface is configured to send beacons.
      rt2x00: Store queue idx and entry idx in data_ring and data_entry
      rt2x00: Move start() and stop() handlers into rt2x00lib.c
      rt2x00: Put 802.11 data on 4 byte boundary
      rt2x00: Move packet filter flags
      rt2x00: Cleanup write_tx_desc() arguments
      rt2x00: Determine MY_BSS from descriptor
      rt2x00: Move init_txring and init_rxring into rt2x00lib
      rt2x00: Correctly initialize data and desc pointer
      rt2x00: Release rt2x00 2.0.14

 drivers/net/wireless/rt2x00/rt2400pci.c   |  102 +++++++--------------
 drivers/net/wireless/rt2x00/rt2500pci.c   |   88 ++++++------------
 drivers/net/wireless/rt2x00/rt2500usb.c   |   36 +++++---
 drivers/net/wireless/rt2x00/rt2x00.h      |   32 ++++---
 drivers/net/wireless/rt2x00/rt2x00debug.c |   13 +--
 drivers/net/wireless/rt2x00/rt2x00dev.c   |  142 ++++++++++++++++++++++++-----
 drivers/net/wireless/rt2x00/rt2x00lib.h   |    4 +-
 drivers/net/wireless/rt2x00/rt2x00mac.c   |   59 +++---------
 drivers/net/wireless/rt2x00/rt2x00pci.c   |   28 ++++--
 drivers/net/wireless/rt2x00/rt2x00ring.h  |   13 +++
 drivers/net/wireless/rt2x00/rt2x00usb.c   |   87 ++++++++----------
 drivers/net/wireless/rt2x00/rt2x00usb.h   |    5 +-
 drivers/net/wireless/rt2x00/rt61pci.c     |  114 +++++++++---------------
 drivers/net/wireless/rt2x00/rt73usb.c     |   35 ++++---
 14 files changed, 378 insertions(+), 380 deletions(-)

[PATCH 01/12] rt2x00: Fix chipset debugfs file

[Ivo van Doorn]

Initialize blob->data before moving the data pointer
Initialize blob->size based on blob->data size

This fixes the empty chipset file in debugfs.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
 drivers/net/wireless/rt2x00/rt2x00debug.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c
index e72c981..c55bf0e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00debug.c
+++ b/drivers/net/wireless/rt2x00/rt2x00debug.c
@@ -417,6 +417,7 @@ static struct dentry *rt2x00debug_create_file_chipset(const char *name,
 	if (!data)
 		return NULL;
 
+	blob->data = data;
 	data += sprintf(data, "rt chip: %04x\n", intf->rt2x00dev->chip.rt);
 	data += sprintf(data, "rf chip: %04x\n", intf->rt2x00dev->chip.rf);
 	data += sprintf(data, "revision:%08x\n", intf->rt2x00dev->chip.rev);
@@ -425,9 +426,7 @@ static struct dentry *rt2x00debug_create_file_chipset(const char *name,
 	data += sprintf(data, "eeprom length: %d\n", debug->eeprom.word_count);
 	data += sprintf(data, "bbp length: %d\n", debug->bbp.word_count);
 	data += sprintf(data, "rf length: %d\n", debug->rf.word_count);
-
-	blob->data = data;
-	blob->size = strlen(data);
+	blob->size = strlen(blob->data);
 
 	return debugfs_create_blob(name, S_IRUGO, intf->driver_folder, blob);
 }
-- 
1.5.3.7

[PATCH 02/12] rt2x00: Always call ieee80211_stop_queue() when return NETDEV_TX_BUSY

[Ivo van Doorn]

Apparently it was possible that ieee80211_stop_queue() was not full while
NETDEV_TX_BUSY was being reported back. I think that is what causing the WARN_ON().
This moves all calls to ieee80211_stop_queue() in rt2x00mac.c where it is easier
to determine if the queue should be halted.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
 drivers/net/wireless/rt2x00/rt2x00mac.c |   17 +++++++++++++----
 drivers/net/wireless/rt2x00/rt2x00pci.c |    8 +-------
 drivers/net/wireless/rt2x00/rt2x00usb.c |    8 +-------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 86b6a33..978cffb 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -84,7 +84,7 @@ int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
 	 */
 	if (!test_bit(DEVICE_PRESENT, &rt2x00dev->flags)) {
 		ieee80211_stop_queues(hw);
-		return 0;
+		return NETDEV_TX_OK;
 	}
 
 	/*
@@ -110,15 +110,24 @@ int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
 	if (!is_rts_frame(frame_control) && !is_cts_frame(frame_control) &&
 	    (control->flags & (IEEE80211_TXCTL_USE_RTS_CTS |
 			       IEEE80211_TXCTL_USE_CTS_PROTECT))) {
-		if (rt2x00_ring_free(ring) <= 1)
+		if (rt2x00_ring_free(ring) <= 1) {
+			ieee80211_stop_queue(rt2x00dev->hw, control->queue);
 			return NETDEV_TX_BUSY;
+		}
 
-		if (rt2x00mac_tx_rts_cts(rt2x00dev, ring, skb, control))
+		if (rt2x00mac_tx_rts_cts(rt2x00dev, ring, skb, control)) {
+			ieee80211_stop_queue(rt2x00dev->hw, control->queue);
 			return NETDEV_TX_BUSY;
+		}
 	}
 
-	if (rt2x00dev->ops->lib->write_tx_data(rt2x00dev, ring, skb, control))
+	if (rt2x00dev->ops->lib->write_tx_data(rt2x00dev, ring, skb, control)) {
+		ieee80211_stop_queue(rt2x00dev->hw, control->queue);
 		return NETDEV_TX_BUSY;
+	}
+
+	if (rt2x00_ring_full(ring))
+		ieee80211_stop_queue(rt2x00dev->hw, control->queue);
 
 	if (rt2x00dev->ops->lib->kick_tx_queue)
 		rt2x00dev->ops->lib->kick_tx_queue(rt2x00dev, control->queue);
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index abeffdb..70cb81c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -86,10 +86,8 @@ int rt2x00pci_write_tx_data(struct rt2x00_dev *rt2x00dev,
 	struct skb_desc *desc;
 	u32 word;
 
-	if (rt2x00_ring_full(ring)) {
-		ieee80211_stop_queue(rt2x00dev->hw, control->queue);
+	if (rt2x00_ring_full(ring))
 		return -EINVAL;
-	}
 
 	rt2x00_desc_read(txd, 0, &word);
 
@@ -99,7 +97,6 @@ int rt2x00pci_write_tx_data(struct rt2x00_dev *rt2x00dev,
 		      "Arrived at non-free entry in the non-full queue %d.\n"
 		      "Please file bug report to %s.\n",
 		      control->queue, DRV_PROJECT);
-		ieee80211_stop_queue(rt2x00dev->hw, control->queue);
 		return -EINVAL;
 	}
 
@@ -119,9 +116,6 @@ int rt2x00pci_write_tx_data(struct rt2x00_dev *rt2x00dev,
 
 	rt2x00_ring_index_inc(ring);
 
-	if (rt2x00_ring_full(ring))
-		ieee80211_stop_queue(rt2x00dev->hw, control->queue);
-
 	return 0;
 }
 EXPORT_SYMBOL_GPL(rt2x00pci_write_tx_data);
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 82e95b9..7aba357 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -179,17 +179,14 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
 	struct skb_desc *desc;
 	u32 length;
 
-	if (rt2x00_ring_full(ring)) {
-		ieee80211_stop_queue(rt2x00dev->hw, control->queue);
+	if (rt2x00_ring_full(ring))
 		return -EINVAL;
-	}
 
 	if (test_bit(ENTRY_OWNER_NIC, &entry->flags)) {
 		ERROR(rt2x00dev,
 		      "Arrived at non-free entry in the non-full queue %d.\n"
 		      "Please file bug report to %s.\n",
 		      control->queue, DRV_PROJECT);
-		ieee80211_stop_queue(rt2x00dev->hw, control->queue);
 		return -EINVAL;
 	}
 
@@ -229,9 +226,6 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
 
 	rt2x00_ring_index_inc(ring);
 
-	if (rt2x00_ring_full(ring))
-		ieee80211_stop_queue(rt2x00dev->hw, control->queue);
-
 	return 0;
 }
 EXPORT_SYMBOL_GPL(rt2x00usb_write_tx_data);
-- 
1.5.3.7

[PATCH 03/12] rt2x00: Only set the TBCN flag when the interface is configured to send beacons.

[Ivo van Doorn]

These flags used to be fixed to one in rt2500pci_config_type, which
caused the beacon timer interrupt to fire. This would lead to
rt2x00lib_beacondone adding work which called
rt2x00lib_beacondone_scheduled which called ieee80211_beacon_get which
printed an error about not having any beacon data.

With this patch, these interrupts are only generated when the interface
is configured to send beacons.

Signed-off-by: Matthijs Kooijman <matthijs@stdin.nl>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
 drivers/net/wireless/rt2x00/rt2400pci.c |    2 +-
 drivers/net/wireless/rt2x00/rt2500pci.c |    2 +-
 drivers/net/wireless/rt2x00/rt2500usb.c |    3 ++-
 drivers/net/wireless/rt2x00/rt61pci.c   |    3 ++-
 drivers/net/wireless/rt2x00/rt73usb.c   |    3 ++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index c9a234f..9eed9e9 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -280,7 +280,7 @@ static void rt2400pci_config_type(struct rt2x00_dev *rt2x00dev, const int type,
 	 */
 	rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
 	rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
-	rt2x00_set_field32(&reg, CSR14_TBCN, 1);
+	rt2x00_set_field32(&reg, CSR14_TBCN, (tsf_sync == TSF_SYNC_BEACON));
 	rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
 	rt2x00_set_field32(&reg, CSR14_TSF_SYNC, tsf_sync);
 	rt2x00pci_register_write(rt2x00dev, CSR14, reg);
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index a623454..8b2f54b 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -284,7 +284,7 @@ static void rt2500pci_config_type(struct rt2x00_dev *rt2x00dev, const int type,
 	 */
 	rt2x00pci_register_read(rt2x00dev, CSR14, &reg);
 	rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 1);
-	rt2x00_set_field32(&reg, CSR14_TBCN, 1);
+	rt2x00_set_field32(&reg, CSR14_TBCN, (tsf_sync == TSF_SYNC_BEACON));
 	rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);
 	rt2x00_set_field32(&reg, CSR14_TSF_SYNC, tsf_sync);
 	rt2x00pci_register_write(rt2x00dev, CSR14, reg);
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 2ba8eda..27d34dd 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -327,7 +327,8 @@ static void rt2500usb_config_type(struct rt2x00_dev *rt2x00dev, const int type,
 
 	rt2500usb_register_read(rt2x00dev, TXRX_CSR19, &reg);
 	rt2x00_set_field16(&reg, TXRX_CSR19_TSF_COUNT, 1);
-	rt2x00_set_field16(&reg, TXRX_CSR19_TBCN, 1);
+	rt2x00_set_field16(&reg, TXRX_CSR19_TBCN,
+			   (tsf_sync == TSF_SYNC_BEACON));
 	rt2x00_set_field16(&reg, TXRX_CSR19_BEACON_GEN, 0);
 	rt2x00_set_field16(&reg, TXRX_CSR19_TSF_SYNC, tsf_sync);
 	rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 13c8086..f5b3378 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -317,7 +317,8 @@ static void rt61pci_config_type(struct rt2x00_dev *rt2x00dev, const int type,
 	 */
 	rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg);
 	rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 1);
-	rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 1);
+	rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE,
+			  (tsf_sync == TSF_SYNC_BEACON));
 	rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 0);
 	rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, tsf_sync);
 	rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 8093a4d..9393415 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -327,7 +327,8 @@ static void rt73usb_config_type(struct rt2x00_dev *rt2x00dev, const int type,
 	 */
 	rt73usb_register_read(rt2x00dev, TXRX_CSR9, &reg);
 	rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 1);
-	rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 1);
+	rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE,
+			   (tsf_sync == TSF_SYNC_BEACON));
 	rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 0);
 	rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, tsf_sync);
 	rt73usb_register_write(rt2x00dev, TXRX_CSR9, reg);
-- 
1.5.3.7

[PATCH 04/12] rt2x00: Store queue idx and entry idx in data_ring and data_entry

[Ivo van Doorn]

Store the queue idx inside structure data_ring
Store the entry idx inside structure data_entry
This saves us a few calls to ARRAY_INDEX() which is now unused.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
 drivers/net/wireless/rt2x00/rt2x00.h      |    6 ------
 drivers/net/wireless/rt2x00/rt2x00debug.c |    8 ++------
 drivers/net/wireless/rt2x00/rt2x00dev.c   |    4 ++++
 drivers/net/wireless/rt2x00/rt2x00ring.h  |   12 ++++++++++++
 drivers/net/wireless/rt2x00/rt61pci.c     |    6 ++++--
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 87c2c05..af0bf4b 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -796,12 +796,6 @@ struct rt2x00_dev {
 	ring_loop(__entry, (__dev)->tx, ring_end(__dev))
 
 /*
- * Compute an array index from a pointer to an element and the base pointer.
- */
-#define ARRAY_INDEX(__elem, __base) \
-	( ((char *)(__elem) - (char *)(__base)) / sizeof(*(__elem)) )
-
-/*
  * Generic RF access.
  * The RF is being accessed by word index.
  */
diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c
index c55bf0e..b44a9f4 100644
--- a/drivers/net/wireless/rt2x00/rt2x00debug.c
+++ b/drivers/net/wireless/rt2x00/rt2x00debug.c
@@ -120,12 +120,8 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
 	struct sk_buff *skbcopy;
 	struct rt2x00dump_hdr *dump_hdr;
 	struct timeval timestamp;
-	unsigned int ring_index;
-	unsigned int entry_index;
 
 	do_gettimeofday(&timestamp);
-	ring_index = ARRAY_INDEX(desc->ring, rt2x00dev->rx);
-	entry_index = ARRAY_INDEX(desc->entry, desc->ring->entry);
 
 	if (!test_bit(FRAME_DUMP_FILE_OPEN, &intf->frame_dump_flags))
 		return;
@@ -151,8 +147,8 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
 	dump_hdr->chip_rf = cpu_to_le16(rt2x00dev->chip.rf);
 	dump_hdr->chip_rev = cpu_to_le32(rt2x00dev->chip.rev);
 	dump_hdr->type = cpu_to_le16(desc->frame_type);
-	dump_hdr->ring_index = ring_index;
-	dump_hdr->entry_index = entry_index;
+	dump_hdr->ring_index = desc->ring->queue_idx;
+	dump_hdr->entry_index = desc->entry->entry_idx;
 	dump_hdr->timestamp_sec = cpu_to_le32(timestamp.tv_sec);
 	dump_hdr->timestamp_usec = cpu_to_le32(timestamp.tv_usec);
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index a771a09..9b2bd91 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -988,6 +988,7 @@ static int rt2x00lib_alloc_entries(struct data_ring *ring,
 		entry[i].flags = 0;
 		entry[i].ring = ring;
 		entry[i].skb = NULL;
+		entry[i].entry_idx = i;
 	}
 
 	ring->entry = entry;
@@ -1115,6 +1116,7 @@ exit:
 static int rt2x00lib_alloc_rings(struct rt2x00_dev *rt2x00dev)
 {
 	struct data_ring *ring;
+	unsigned int index;
 
 	/*
 	 * We need the following rings:
@@ -1145,8 +1147,10 @@ static int rt2x00lib_alloc_rings(struct rt2x00_dev *rt2x00dev)
 	 * cw_min: 2^5 = 32.
 	 * cw_max: 2^10 = 1024.
 	 */
+	index = 0;
 	ring_for_each(rt2x00dev, ring) {
 		ring->rt2x00dev = rt2x00dev;
+		ring->queue_idx = index++;
 		ring->tx_params.aifs = 2;
 		ring->tx_params.cw_min = 5;
 		ring->tx_params.cw_max = 10;
diff --git a/drivers/net/wireless/rt2x00/rt2x00ring.h b/drivers/net/wireless/rt2x00/rt2x00ring.h
index 5b32f3e..e9a5648 100644
--- a/drivers/net/wireless/rt2x00/rt2x00ring.h
+++ b/drivers/net/wireless/rt2x00/rt2x00ring.h
@@ -143,6 +143,11 @@ struct data_entry {
 	 */
 	void *data_addr;
 	dma_addr_t data_dma;
+
+	/*
+	 * Entry identification number (index).
+	 */
+	unsigned int entry_idx;
 };
 
 /*
@@ -181,6 +186,13 @@ struct data_ring {
 	void *data_addr;
 
 	/*
+	 * Queue identification number:
+	 * RX: 0
+	 * TX: IEEE80211_TX_*
+	 */
+	unsigned int queue_idx;
+
+	/*
 	 * Index variables.
 	 */
 	u16 index;
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index f5b3378..3bfc5af 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -1031,8 +1031,10 @@ static void rt61pci_init_txring(struct rt2x00_dev *rt2x00dev, const int queue)
 		rt2x00_desc_write(txd, 1, word);
 
 		rt2x00_desc_read(txd, 5, &word);
-		rt2x00_set_field32(&word, TXD_W5_PID_TYPE, queue);
-		rt2x00_set_field32(&word, TXD_W5_PID_SUBTYPE, i);
+		rt2x00_set_field32(&word, TXD_W5_PID_TYPE,
+				   ring->queue_idx);
+		rt2x00_set_field32(&word, TXD_W5_PID_SUBTYPE,
+				   ring->entry[i].entry_idx);
 		rt2x00_desc_write(txd, 5, word);
 
 		rt2x00_desc_read(txd, 6, &word);
-- 
1.5.3.7

[PATCH 05/12] rt2x00: Move start() and stop() handlers into rt2x00lib.c

[Ivo van Doorn]

suspend & resume was broken since it called rt2x00mac_start()
and rt2x00mac_stop() which would fail to execute because the
DEVICE_PRESENT flag was not set.

Move the start and stop handlers into rt2x00lib.c which are called
from rt2x00mac_start() and rt2x00mac_stop() after they have checked
the DEVICE_PRESENT flag, while suspend and resume handlers can
directly call those functions.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
 drivers/net/wireless/rt2x00/rt2x00dev.c |   66 ++++++++++++++++++++++++++++--
 drivers/net/wireless/rt2x00/rt2x00lib.h |    4 +-
 drivers/net/wireless/rt2x00/rt2x00mac.c |   42 +------------------
 3 files changed, 66 insertions(+), 46 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 9b2bd91..cea2bd9 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1046,7 +1046,7 @@ static void rt2x00lib_free_ring_entries(struct rt2x00_dev *rt2x00dev)
 	}
 }
 
-void rt2x00lib_uninitialize(struct rt2x00_dev *rt2x00dev)
+static void rt2x00lib_uninitialize(struct rt2x00_dev *rt2x00dev)
 {
 	if (!__test_and_clear_bit(DEVICE_INITIALIZED, &rt2x00dev->flags))
 		return;
@@ -1067,7 +1067,7 @@ void rt2x00lib_uninitialize(struct rt2x00_dev *rt2x00dev)
 	rt2x00lib_free_ring_entries(rt2x00dev);
 }
 
-int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)
+static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)
 {
 	int status;
 
@@ -1110,6 +1110,58 @@ exit:
 	return status;
 }
 
+int rt2x00lib_start(struct rt2x00_dev *rt2x00dev)
+{
+	int retval;
+
+	if (test_bit(DEVICE_STARTED, &rt2x00dev->flags))
+		return 0;
+
+	/*
+	 * If this is the first interface which is added,
+	 * we should load the firmware now.
+	 */
+	if (test_bit(DRIVER_REQUIRE_FIRMWARE, &rt2x00dev->flags)) {
+		retval = rt2x00lib_load_firmware(rt2x00dev);
+		if (retval)
+			return retval;
+	}
+
+	/*
+	 * Initialize the device.
+	 */
+	retval = rt2x00lib_initialize(rt2x00dev);
+	if (retval)
+		return retval;
+
+	/*
+	 * Enable radio.
+	 */
+	retval = rt2x00lib_enable_radio(rt2x00dev);
+	if (retval) {
+		rt2x00lib_uninitialize(rt2x00dev);
+		return retval;
+	}
+
+	__set_bit(DEVICE_STARTED, &rt2x00dev->flags);
+
+	return 0;
+}
+
+void rt2x00lib_stop(struct rt2x00_dev *rt2x00dev)
+{
+	if (!test_bit(DEVICE_STARTED, &rt2x00dev->flags))
+		return;
+
+	/*
+	 * Perhaps we can add something smarter here,
+	 * but for now just disabling the radio should do.
+	 */
+	rt2x00lib_disable_radio(rt2x00dev);
+
+	__clear_bit(DEVICE_STARTED, &rt2x00dev->flags);
+}
+
 /*
  * driver allocation handlers.
  */
@@ -1295,7 +1347,7 @@ int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
 	 * Disable radio and unitialize all items
 	 * that must be recreated on resume.
 	 */
-	rt2x00mac_stop(rt2x00dev->hw);
+	rt2x00lib_stop(rt2x00dev);
 	rt2x00lib_uninitialize(rt2x00dev);
 	rt2x00debug_deregister(rt2x00dev);
 
@@ -1317,7 +1369,6 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
 	int retval;
 
 	NOTICE(rt2x00dev, "Waking up.\n");
-	__set_bit(DEVICE_PRESENT, &rt2x00dev->flags);
 
 	/*
 	 * Open the debugfs entry.
@@ -1333,7 +1384,7 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
 	/*
 	 * Reinitialize device and all active interfaces.
 	 */
-	retval = rt2x00mac_start(rt2x00dev->hw);
+	retval = rt2x00lib_start(rt2x00dev);
 	if (retval)
 		goto exit;
 
@@ -1349,6 +1400,11 @@ int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
 	rt2x00lib_config_type(rt2x00dev, intf->type);
 
 	/*
+	 * We are ready again to receive requests from mac80211.
+	 */
+	__set_bit(DEVICE_PRESENT, &rt2x00dev->flags);
+
+	/*
 	 * It is possible that during that mac80211 has attempted
 	 * to send frames while we were suspending or resuming.
 	 * In that case we have disabled the TX queue and should
diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h
index 108488d..1adbd28 100644
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -44,8 +44,8 @@ void rt2x00lib_reset_link_tuner(struct rt2x00_dev *rt2x00dev);
 /*
  * Initialization handlers.
  */
-int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev);
-void rt2x00lib_uninitialize(struct rt2x00_dev *rt2x00dev);
+int rt2x00lib_start(struct rt2x00_dev *rt2x00dev);
+void rt2x00lib_stop(struct rt2x00_dev *rt2x00dev);
 
 /*
  * Configuration handlers.
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 978cffb..1d67bcd 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -139,41 +139,11 @@ EXPORT_SYMBOL_GPL(rt2x00mac_tx);
 int rt2x00mac_start(struct ieee80211_hw *hw)
 {
 	struct rt2x00_dev *rt2x00dev = hw->priv;
-	int status;
 
-	if (!test_bit(DEVICE_PRESENT, &rt2x00dev->flags) ||
-	    test_bit(DEVICE_STARTED, &rt2x00dev->flags))
+	if (!test_bit(DEVICE_PRESENT, &rt2x00dev->flags))
 		return 0;
 
-	/*
-	 * If this is the first interface which is added,
-	 * we should load the firmware now.
-	 */
-	if (test_bit(DRIVER_REQUIRE_FIRMWARE, &rt2x00dev->flags)) {
-		status = rt2x00lib_load_firmware(rt2x00dev);
-		if (status)
-			return status;
-	}
-
-	/*
-	 * Initialize the device.
-	 */
-	status = rt2x00lib_initialize(rt2x00dev);
-	if (status)
-		return status;
-
-	/*
-	 * Enable radio.
-	 */
-	status = rt2x00lib_enable_radio(rt2x00dev);
-	if (status) {
-		rt2x00lib_uninitialize(rt2x00dev);
-		return status;
-	}
-
-	__set_bit(DEVICE_STARTED, &rt2x00dev->flags);
-
-	return 0;
+	return rt2x00lib_start(rt2x00dev);
 }
 EXPORT_SYMBOL_GPL(rt2x00mac_start);
 
@@ -184,13 +154,7 @@ void rt2x00mac_stop(struct ieee80211_hw *hw)
 	if (!test_bit(DEVICE_PRESENT, &rt2x00dev->flags))
 		return;
 
-	/*
-	 * Perhaps we can add something smarter here,
-	 * but for now just disabling the radio should do.
-	 */
-	rt2x00lib_disable_radio(rt2x00dev);
-
-	__clear_bit(DEVICE_STARTED, &rt2x00dev->flags);
+	rt2x00lib_stop(rt2x00dev);
 }
 EXPORT_SYMBOL_GPL(rt2x00mac_stop);
 
-- 
1.5.3.7

[PATCH 06/12] rt2x00: Put 802.11 data on 4 byte boundary

[Ivo van Doorn]

Check the size of the ieee80211 header during rxdone
and make sure the data behind the ieee80211 header
is placed on a 4 byte boundary.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
 drivers/net/wireless/rt2x00/rt2x00pci.c |   20 ++++++++++++++++----
 drivers/net/wireless/rt2x00/rt2x00usb.c |   17 +++++++++++++++--
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index 70cb81c..dbc23c4 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -129,7 +129,10 @@ void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
 	struct data_entry *entry;
 	struct sk_buff *skb;
 	struct skb_desc *skbdesc;
+	struct ieee80211_hdr *hdr;
 	struct rxdata_entry_desc desc;
+	int header_size;
+	int align;
 	__le32 *rxd;
 	u32 word;
 
@@ -144,17 +147,26 @@ void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)
 		memset(&desc, 0, sizeof(desc));
 		rt2x00dev->ops->lib->fill_rxdone(entry, &desc);
 
+		hdr = (struct ieee80211_hdr *)entry->data_addr;
+		header_size =
+		    ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control));
+
+		/*
+		 * The data behind the ieee80211 header must be
+		 * aligned on a 4 byte boundary.
+		 */
+		align = NET_IP_ALIGN + (2 * (header_size % 4 == 0));
+
 		/*
 		 * Allocate the sk_buffer, initialize it and copy
 		 * all data into it.
 		 */
-		skb = dev_alloc_skb(desc.size + NET_IP_ALIGN);
+		skb = dev_alloc_skb(desc.size + align);
 		if (!skb)
 			return;
 
-		skb_reserve(skb, NET_IP_ALIGN);
-		skb_put(skb, desc.size);
-		memcpy(skb->data, entry->data_addr, desc.size);
+		skb_reserve(skb, align);
+		memcpy(skb_put(skb, desc.size), entry->data_addr, desc.size);
 
 		/*
 		 * Fill in skb descriptor
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 7aba357..8a6218f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -240,7 +240,9 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
 	struct rt2x00_dev *rt2x00dev = ring->rt2x00dev;
 	struct sk_buff *skb;
 	struct skb_desc *skbdesc;
+	struct ieee80211_hdr *hdr;
 	struct rxdata_entry_desc desc;
+	int header_size;
 	int frame_size;
 
 	if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags) ||
@@ -272,9 +274,20 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
 	skb_put(skb, frame_size);
 
 	/*
-	 * Trim the skb_buffer to only contain the valid
-	 * frame data (so ignore the device's descriptor).
+	 * The data behind the ieee80211 header must be
+	 * aligned on a 4 byte boundary.
+	 * After that trim the entire buffer down to only
+	 * contain the valid frame data excluding the device
+	 * descriptor.
 	 */
+	hdr = (struct ieee80211_hdr *)entry->skb->data;
+	header_size =
+	    ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control));
+
+	if (header_size % 4 == 0) {
+		skb_push(entry->skb, 2);
+		memmove(entry->skb->data, entry->skb->data + 2, skb->len - 2);
+	}
 	skb_trim(entry->skb, desc.size);
 
 	/*
-- 
1.5.3.7

[PATCH 07/12] rt2x00: Move packet filter flags

[Ivo van Doorn]

The packet filter flags don't belong in the interface structure
because they are device based instead of interface based.
So move the filter fields out of struct interface and into rt2x00_dev.

Additionally we shouldn't change the filter based on the working
mode, if such a thing is needed than mac80211 should have done that.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
 drivers/net/wireless/rt2x00/rt2400pci.c |    8 ++------
 drivers/net/wireless/rt2x00/rt2500pci.c |    8 ++------
 drivers/net/wireless/rt2x00/rt2500usb.c |    8 ++------
 drivers/net/wireless/rt2x00/rt2x00.h    |   12 +++++++-----
 drivers/net/wireless/rt2x00/rt2x00dev.c |    4 ++--
 drivers/net/wireless/rt2x00/rt61pci.c   |    8 ++------
 drivers/net/wireless/rt2x00/rt73usb.c   |    8 ++------
 7 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index 9eed9e9..b042eb5 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1422,7 +1422,6 @@ static void rt2400pci_configure_filter(struct ieee80211_hw *hw,
 				       struct dev_addr_list *mc_list)
 {
 	struct rt2x00_dev *rt2x00dev = hw->priv;
-	struct interface *intf = &rt2x00dev->interface;
 	u32 reg;
 
 	/*
@@ -1441,21 +1440,18 @@ static void rt2400pci_configure_filter(struct ieee80211_hw *hw,
 	 * Apply some rules to the filters:
 	 * - Some filters imply different filters to be set.
 	 * - Some things we can't filter out at all.
-	 * - Some filters are set based on interface type.
 	 */
 	*total_flags |= FIF_ALLMULTI;
 	if (*total_flags & FIF_OTHER_BSS ||
 	    *total_flags & FIF_PROMISC_IN_BSS)
 		*total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
-	if (is_interface_type(intf, IEEE80211_IF_TYPE_AP))
-		*total_flags |= FIF_PROMISC_IN_BSS;
 
 	/*
 	 * Check if there is any work left for us.
 	 */
-	if (intf->filter == *total_flags)
+	if (rt2x00dev->packet_filter == *total_flags)
 		return;
-	intf->filter = *total_flags;
+	rt2x00dev->packet_filter = *total_flags;
 
 	/*
 	 * Start configuration steps.
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 8b2f54b..c92163d 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1751,7 +1751,6 @@ static void rt2500pci_configure_filter(struct ieee80211_hw *hw,
 				       struct dev_addr_list *mc_list)
 {
 	struct rt2x00_dev *rt2x00dev = hw->priv;
-	struct interface *intf = &rt2x00dev->interface;
 	u32 reg;
 
 	/*
@@ -1770,22 +1769,19 @@ static void rt2500pci_configure_filter(struct ieee80211_hw *hw,
 	 * Apply some rules to the filters:
 	 * - Some filters imply different filters to be set.
 	 * - Some things we can't filter out at all.
-	 * - Some filters are set based on interface type.
 	 */
 	if (mc_count)
 		*total_flags |= FIF_ALLMULTI;
 	if (*total_flags & FIF_OTHER_BSS ||
 	    *total_flags & FIF_PROMISC_IN_BSS)
 		*total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
-	if (is_interface_type(intf, IEEE80211_IF_TYPE_AP))
-		*total_flags |= FIF_PROMISC_IN_BSS;
 
 	/*
 	 * Check if there is any work left for us.
 	 */
-	if (intf->filter == *total_flags)
+	if (rt2x00dev->packet_filter == *total_flags)
 		return;
-	intf->filter = *total_flags;
+	rt2x00dev->packet_filter = *total_flags;
 
 	/*
 	 * Start configuration steps.
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 27d34dd..576f0f8 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1611,7 +1611,6 @@ static void rt2500usb_configure_filter(struct ieee80211_hw *hw,
 				       struct dev_addr_list *mc_list)
 {
 	struct rt2x00_dev *rt2x00dev = hw->priv;
-	struct interface *intf = &rt2x00dev->interface;
 	u16 reg;
 
 	/*
@@ -1630,22 +1629,19 @@ static void rt2500usb_configure_filter(struct ieee80211_hw *hw,
 	 * Apply some rules to the filters:
 	 * - Some filters imply different filters to be set.
 	 * - Some things we can't filter out at all.
-	 * - Some filters are set based on interface type.
 	 */
 	if (mc_count)
 		*total_flags |= FIF_ALLMULTI;
 	if (*total_flags & FIF_OTHER_BSS ||
 	    *total_flags & FIF_PROMISC_IN_BSS)
 		*total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
-	if (is_interface_type(intf, IEEE80211_IF_TYPE_AP))
-		*total_flags |= FIF_PROMISC_IN_BSS;
 
 	/*
 	 * Check if there is any work left for us.
 	 */
-	if (intf->filter == *total_flags)
+	if (rt2x00dev->packet_filter == *total_flags)
 		return;
-	intf->filter = *total_flags;
+	rt2x00dev->packet_filter = *total_flags;
 
 	/*
 	 * When in atomic context, reschedule and let rt2x00lib
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index af0bf4b..0dc880c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -388,11 +388,6 @@ struct interface {
 	 * BBSID of the AP to associate with.
 	 */
 	u8 bssid[ETH_ALEN];
-
-	/*
-	 * Store the packet filter mode for the current interface.
-	 */
-	unsigned int filter;
 };
 
 static inline int is_interface_present(struct interface *intf)
@@ -676,6 +671,13 @@ struct rt2x00_dev {
 	struct mutex usb_cache_mutex;
 
 	/*
+	 * Current packet filter configuration for the device.
+	 * This contains all currently active FIF_* flags send
+	 * to us by mac80211 during configure_filter().
+	 */
+	unsigned int packet_filter;
+
+	/*
 	 * Interface configuration.
 	 */
 	struct interface interface;
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index cea2bd9..911060d 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -417,7 +417,7 @@ static void rt2x00lib_packetfilter_scheduled(struct work_struct *work)
 {
 	struct rt2x00_dev *rt2x00dev =
 	    container_of(work, struct rt2x00_dev, filter_work);
-	unsigned int filter = rt2x00dev->interface.filter;
+	unsigned int filter = rt2x00dev->packet_filter;
 
 	/*
 	 * Since we had stored the filter inside interface.filter,
@@ -425,7 +425,7 @@ static void rt2x00lib_packetfilter_scheduled(struct work_struct *work)
 	 * assume nothing has changed (*total_flags will be compared
 	 * to interface.filter to determine if any action is required).
 	 */
-	rt2x00dev->interface.filter = 0;
+	rt2x00dev->packet_filter = 0;
 
 	rt2x00dev->ops->hw->configure_filter(rt2x00dev->hw,
 					     filter, &filter, 0, NULL);
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 3bfc5af..34bd90b 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2311,7 +2311,6 @@ static void rt61pci_configure_filter(struct ieee80211_hw *hw,
 				     struct dev_addr_list *mc_list)
 {
 	struct rt2x00_dev *rt2x00dev = hw->priv;
-	struct interface *intf = &rt2x00dev->interface;
 	u32 reg;
 
 	/*
@@ -2330,22 +2329,19 @@ static void rt61pci_configure_filter(struct ieee80211_hw *hw,
 	 * Apply some rules to the filters:
 	 * - Some filters imply different filters to be set.
 	 * - Some things we can't filter out at all.
-	 * - Some filters are set based on interface type.
 	 */
 	if (mc_count)
 		*total_flags |= FIF_ALLMULTI;
 	if (*total_flags & FIF_OTHER_BSS ||
 	    *total_flags & FIF_PROMISC_IN_BSS)
 		*total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
-	if (is_interface_type(intf, IEEE80211_IF_TYPE_AP))
-		*total_flags |= FIF_PROMISC_IN_BSS;
 
 	/*
 	 * Check if there is any work left for us.
 	 */
-	if (intf->filter == *total_flags)
+	if (rt2x00dev->packet_filter == *total_flags)
 		return;
-	intf->filter = *total_flags;
+	rt2x00dev->packet_filter = *total_flags;
 
 	/*
 	 * Start configuration steps.
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 9393415..f2d1810 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1846,7 +1846,6 @@ static void rt73usb_configure_filter(struct ieee80211_hw *hw,
 				     struct dev_addr_list *mc_list)
 {
 	struct rt2x00_dev *rt2x00dev = hw->priv;
-	struct interface *intf = &rt2x00dev->interface;
 	u32 reg;
 
 	/*
@@ -1865,22 +1864,19 @@ static void rt73usb_configure_filter(struct ieee80211_hw *hw,
 	 * Apply some rules to the filters:
 	 * - Some filters imply different filters to be set.
 	 * - Some things we can't filter out at all.
-	 * - Some filters are set based on interface type.
 	 */
 	if (mc_count)
 		*total_flags |= FIF_ALLMULTI;
 	if (*total_flags & FIF_OTHER_BSS ||
 	    *total_flags & FIF_PROMISC_IN_BSS)
 		*total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
-	if (is_interface_type(intf, IEEE80211_IF_TYPE_AP))
-		*total_flags |= FIF_PROMISC_IN_BSS;
 
 	/*
 	 * Check if there is any work left for us.
 	 */
-	if (intf->filter == *total_flags)
+	if (rt2x00dev->packet_filter == *total_flags)
 		return;
-	intf->filter = *total_flags;
+	rt2x00dev->packet_filter = *total_flags;
 
 	/*
 	 * When in atomic context, reschedule and let rt2x00lib
-- 
1.5.3.7

[PATCH 08/12] rt2x00: Cleanup write_tx_desc() arguments

[Ivo van Doorn]

Send the skb structure with write_tx_desc() and use
the skbdesc structure to read all information about
the frame. This saves several arguments in the function
definition and it is easier to send more information
later as well.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
 drivers/net/wireless/rt2x00/rt2400pci.c |    8 ++++----
 drivers/net/wireless/rt2x00/rt2500pci.c |    8 ++++----
 drivers/net/wireless/rt2x00/rt2500usb.c |    8 ++++----
 drivers/net/wireless/rt2x00/rt2x00.h    |    4 +---
 drivers/net/wireless/rt2x00/rt2x00dev.c |    4 +---
 drivers/net/wireless/rt2x00/rt61pci.c   |   14 +++++++-------
 drivers/net/wireless/rt2x00/rt73usb.c   |   12 ++++++------
 7 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index b042eb5..ffc7e20 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1012,19 +1012,19 @@ static int rt2400pci_set_device_state(struct rt2x00_dev *rt2x00dev,
  * TX descriptor initialization
  */
 static void rt2400pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
-				    __le32 *txd,
+				    struct sk_buff *skb,
 				    struct txdata_entry_desc *desc,
-				    struct ieee80211_hdr *ieee80211hdr,
-				    unsigned int length,
 				    struct ieee80211_tx_control *control)
 {
+	struct skb_desc *skbdesc = get_skb_desc(skb);
+	__le32 *txd = skbdesc->desc;
 	u32 word;
 
 	/*
 	 * Start writing the descriptor words.
 	 */
 	rt2x00_desc_read(txd, 2, &word);
-	rt2x00_set_field32(&word, TXD_W2_DATABYTE_COUNT, length);
+	rt2x00_set_field32(&word, TXD_W2_DATABYTE_COUNT, skbdesc->data_len);
 	rt2x00_desc_write(txd, 2, word);
 
 	rt2x00_desc_read(txd, 3, &word);
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index c92163d..81a48e8 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1162,12 +1162,12 @@ static int rt2500pci_set_device_state(struct rt2x00_dev *rt2x00dev,
  * TX descriptor initialization
  */
 static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
-				    __le32 *txd,
+				    struct sk_buff *skb,
 				    struct txdata_entry_desc *desc,
-				    struct ieee80211_hdr *ieee80211hdr,
-				    unsigned int length,
 				    struct ieee80211_tx_control *control)
 {
+	struct skb_desc *skbdesc = get_skb_desc(skb);
+	__le32 *txd = skbdesc->desc;
 	u32 word;
 
 	/*
@@ -1208,7 +1208,7 @@ static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 	rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,
 			   !!(control->flags &
 			      IEEE80211_TXCTL_LONG_RETRY_LIMIT));
-	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, length);
+	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skbdesc->data_len);
 	rt2x00_set_field32(&word, TXD_W0_CIPHER_ALG, CIPHER_NONE);
 	rt2x00_desc_write(txd, 0, word);
 }
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 576f0f8..f136703 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1024,12 +1024,12 @@ static int rt2500usb_set_device_state(struct rt2x00_dev *rt2x00dev,
  * TX descriptor initialization
  */
 static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
-				    __le32 *txd,
+				    struct sk_buff *skb,
 				    struct txdata_entry_desc *desc,
-				    struct ieee80211_hdr *ieee80211hdr,
-				    unsigned int length,
 				    struct ieee80211_tx_control *control)
 {
+	struct skb_desc *skbdesc = get_skb_desc(skb);
+	__le32 *txd = skbdesc->desc;
 	u32 word;
 
 	/*
@@ -1062,7 +1062,7 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 	rt2x00_set_field32(&word, TXD_W0_NEW_SEQ,
 			   !!(control->flags & IEEE80211_TXCTL_FIRST_FRAGMENT));
 	rt2x00_set_field32(&word, TXD_W0_IFS, desc->ifs);
-	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, length);
+	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skbdesc->data_len);
 	rt2x00_set_field32(&word, TXD_W0_CIPHER, CIPHER_NONE);
 	rt2x00_desc_write(txd, 0, word);
 }
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 0dc880c..0795332 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -488,10 +488,8 @@ struct rt2x00lib_ops {
 	 * TX control handlers
 	 */
 	void (*write_tx_desc) (struct rt2x00_dev *rt2x00dev,
-			       __le32 *txd,
+			       struct sk_buff *skb,
 			       struct txdata_entry_desc *desc,
-			       struct ieee80211_hdr *ieee80211hdr,
-			       unsigned int length,
 			       struct ieee80211_tx_control *control);
 	int (*write_tx_data) (struct rt2x00_dev *rt2x00dev,
 			      struct data_ring *ring, struct sk_buff *skb,
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 911060d..a95cf53 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -601,7 +601,6 @@ void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 	struct txdata_entry_desc desc;
 	struct skb_desc *skbdesc = get_skb_desc(skb);
 	struct ieee80211_hdr *ieee80211hdr = skbdesc->data;
-	__le32 *txd = skbdesc->desc;
 	int tx_rate;
 	int bitrate;
 	int length;
@@ -729,8 +728,7 @@ void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 			desc.signal |= 0x08;
 	}
 
-	rt2x00dev->ops->lib->write_tx_desc(rt2x00dev, txd, &desc, ieee80211hdr,
-					   skbdesc->data_len, control);
+	rt2x00dev->ops->lib->write_tx_desc(rt2x00dev, skb, &desc, control);
 
 	/*
 	 * Update ring entry.
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 34bd90b..3080984 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -1533,12 +1533,12 @@ static int rt61pci_set_device_state(struct rt2x00_dev *rt2x00dev,
  * TX descriptor initialization
  */
 static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
-				  __le32 *txd,
-				  struct txdata_entry_desc *desc,
-				  struct ieee80211_hdr *ieee80211hdr,
-				  unsigned int length,
-				  struct ieee80211_tx_control *control)
+				    struct sk_buff *skb,
+				    struct txdata_entry_desc *desc,
+				    struct ieee80211_tx_control *control)
 {
+	struct skb_desc *skbdesc = get_skb_desc(skb);
+	__le32 *txd = skbdesc->desc;
 	u32 word;
 
 	/*
@@ -1567,7 +1567,7 @@ static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 	rt2x00_desc_write(txd, 5, word);
 
 	rt2x00_desc_read(txd, 11, &word);
-	rt2x00_set_field32(&word, TXD_W11_BUFFER_LENGTH0, length);
+	rt2x00_set_field32(&word, TXD_W11_BUFFER_LENGTH0, skbdesc->data_len);
 	rt2x00_desc_write(txd, 11, word);
 
 	rt2x00_desc_read(txd, 0, &word);
@@ -1586,7 +1586,7 @@ static void rt61pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 			   !!(control->flags &
 			      IEEE80211_TXCTL_LONG_RETRY_LIMIT));
 	rt2x00_set_field32(&word, TXD_W0_TKIP_MIC, 0);
-	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, length);
+	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skbdesc->data_len);
 	rt2x00_set_field32(&word, TXD_W0_BURST,
 			   test_bit(ENTRY_TXD_BURST, &desc->flags));
 	rt2x00_set_field32(&word, TXD_W0_CIPHER_ALG, CIPHER_NONE);
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index f2d1810..2982470 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1231,12 +1231,12 @@ static int rt73usb_set_device_state(struct rt2x00_dev *rt2x00dev,
  * TX descriptor initialization
  */
 static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
-				  __le32 *txd,
-				  struct txdata_entry_desc *desc,
-				  struct ieee80211_hdr *ieee80211hdr,
-				  unsigned int length,
-				  struct ieee80211_tx_control *control)
+				    struct sk_buff *skb,
+				    struct txdata_entry_desc *desc,
+				    struct ieee80211_tx_control *control)
 {
+	struct skb_desc *skbdesc = get_skb_desc(skb);
+	__le32 *txd = skbdesc->desc;
 	u32 word;
 
 	/*
@@ -1281,7 +1281,7 @@ static void rt73usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
 			   !!(control->flags &
 			      IEEE80211_TXCTL_LONG_RETRY_LIMIT));
 	rt2x00_set_field32(&word, TXD_W0_TKIP_MIC, 0);
-	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, length);
+	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skbdesc->data_len);
 	rt2x00_set_field32(&word, TXD_W0_BURST2,
 			   test_bit(ENTRY_TXD_BURST, &desc->flags));
 	rt2x00_set_field32(&word, TXD_W0_CIPHER_ALG, CIPHER_NONE);
-- 
1.5.3.7

[PATCH 09/12] rt2x00: Determine MY_BSS from descriptor

[Ivo van Doorn]

Use the MY_BSS descriptor field to determine if the
received frame belongs to the same BSS as the interface.
This can be used by rxdone to determine if the frame
should be updated or not.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
 drivers/net/wireless/rt2x00/rt2400pci.c  |    1 +
 drivers/net/wireless/rt2x00/rt2500pci.c  |    1 +
 drivers/net/wireless/rt2x00/rt2500usb.c  |    3 +--
 drivers/net/wireless/rt2x00/rt2x00dev.c  |   18 +++++-------------
 drivers/net/wireless/rt2x00/rt2x00ring.h |    1 +
 drivers/net/wireless/rt2x00/rt61pci.c    |    3 +--
 drivers/net/wireless/rt2x00/rt73usb.c    |    3 +--
 7 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index ffc7e20..95db2cc 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1117,6 +1117,7 @@ static void rt2400pci_fill_rxdone(struct data_entry *entry,
 	    entry->ring->rt2x00dev->rssi_offset;
 	desc->ofdm = 0;
 	desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
+	desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
 }
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 81a48e8..133967e 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1264,6 +1264,7 @@ static void rt2500pci_fill_rxdone(struct data_entry *entry,
 	    entry->ring->rt2x00dev->rssi_offset;
 	desc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
 	desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
+	desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
 }
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index f136703..2a4e939 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1138,8 +1138,7 @@ static void rt2500usb_fill_rxdone(struct data_entry *entry,
 	    entry->ring->rt2x00dev->rssi_offset;
 	desc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
 	desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
-
-	return;
+	desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
 }
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index a95cf53..a114212 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -526,7 +526,6 @@ void rt2x00lib_rxdone(struct data_entry *entry, struct sk_buff *skb,
 		      struct rxdata_entry_desc *desc)
 {
 	struct rt2x00_dev *rt2x00dev = entry->ring->rt2x00dev;
-	struct interface *intf = &rt2x00dev->interface;
 	struct ieee80211_rx_status *rx_status = &rt2x00dev->rx_status;
 	struct ieee80211_hw_mode *mode;
 	struct ieee80211_rate *rate;
@@ -559,19 +558,12 @@ void rt2x00lib_rxdone(struct data_entry *entry, struct sk_buff *skb,
 	}
 
 	/*
-	 * Only update link status if this is a beacon frame carrying our
-	 * bssid.
+	 * Only update link status if this is a beacon frame carrying our bssid.
 	 */
-	hdr = (struct ieee80211_hdr *) skb->data;
-	if (skb->len >= sizeof(struct ieee80211_hdr *)) {
-		fc = le16_to_cpu(hdr->frame_control);
-		if ((intf->type == IEEE80211_IF_TYPE_STA
-		     || intf->type == IEEE80211_IF_TYPE_IBSS)
-		    && is_beacon(fc)
-		    && compare_ether_addr(hdr->addr3, intf->bssid) == 0)
-			rt2x00lib_update_link_stats(&rt2x00dev->link,
-						    desc->rssi);
-	}
+	hdr = (struct ieee80211_hdr*)skb->data;
+	fc = le16_to_cpu(hdr->frame_control);
+	if (is_beacon(fc) && desc->my_bss)
+		rt2x00lib_update_link_stats(&rt2x00dev->link, desc->rssi);
 
 	rt2x00dev->link.qual.rx_success++;
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00ring.h b/drivers/net/wireless/rt2x00/rt2x00ring.h
index e9a5648..1caa6d6 100644
--- a/drivers/net/wireless/rt2x00/rt2x00ring.h
+++ b/drivers/net/wireless/rt2x00/rt2x00ring.h
@@ -59,6 +59,7 @@ struct rxdata_entry_desc {
 	int ofdm;
 	int size;
 	int flags;
+	int my_bss;
 };
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 3080984..47b7430 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -1695,8 +1695,7 @@ static void rt61pci_fill_rxdone(struct data_entry *entry,
 	desc->rssi = rt61pci_agc_to_rssi(entry->ring->rt2x00dev, word1);
 	desc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
 	desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
-
-	return;
+	desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
 }
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 2982470..beaa264 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1396,13 +1396,12 @@ static void rt73usb_fill_rxdone(struct data_entry *entry,
 	desc->rssi = rt73usb_agc_to_rssi(entry->ring->rt2x00dev, word1);
 	desc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
 	desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
+	desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
 
 	/*
 	 * Pull the skb to clear the descriptor area.
 	 */
 	skb_pull(entry->skb, entry->ring->desc_size);
-
-	return;
 }
 
 /*
-- 
1.5.3.7

[PATCH 10/12] rt2x00: Move init_txring and init_rxring into rt2x00lib

[Ivo van Doorn]

Prior to enabling the radio rt2x00lib should go through all
rings and for each entry should call the callback function
init_txentry() and init_rxentry().

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
 drivers/net/wireless/rt2x00/rt2400pci.c |   83 +++++++++-------------------
 drivers/net/wireless/rt2x00/rt2500pci.c |   69 +++++++-----------------
 drivers/net/wireless/rt2x00/rt2500usb.c |    4 +-
 drivers/net/wireless/rt2x00/rt2x00.h    |    8 +++
 drivers/net/wireless/rt2x00/rt2x00dev.c |   46 ++++++++++++++++
 drivers/net/wireless/rt2x00/rt2x00usb.c |   60 ++++++++-------------
 drivers/net/wireless/rt2x00/rt2x00usb.h |    5 ++-
 drivers/net/wireless/rt2x00/rt61pci.c   |   88 +++++++++++--------------------
 drivers/net/wireless/rt2x00/rt73usb.c   |    4 +-
 9 files changed, 163 insertions(+), 204 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index 95db2cc..f4d0c77 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -592,65 +592,43 @@ static void rt2400pci_link_tuner(struct rt2x00_dev *rt2x00dev)
 /*
  * Initialization functions.
  */
-static void rt2400pci_init_rxring(struct rt2x00_dev *rt2x00dev)
+static void rt2400pci_init_rxentry(struct rt2x00_dev *rt2x00dev,
+				   struct data_entry *entry)
 {
-	struct data_ring *ring = rt2x00dev->rx;
-	__le32 *rxd;
-	unsigned int i;
+	__le32 *rxd = entry->priv;
 	u32 word;
 
-	memset(ring->data_addr, 0x00, rt2x00_get_ring_size(ring));
-
-	for (i = 0; i < ring->stats.limit; i++) {
-		rxd = ring->entry[i].priv;
+	rt2x00_desc_read(rxd, 2, &word);
+	rt2x00_set_field32(&word, RXD_W2_BUFFER_LENGTH, entry->ring->data_size);
+	rt2x00_desc_write(rxd, 2, word);
 
-		rt2x00_desc_read(rxd, 2, &word);
-		rt2x00_set_field32(&word, RXD_W2_BUFFER_LENGTH,
-				   ring->data_size);
-		rt2x00_desc_write(rxd, 2, word);
-
-		rt2x00_desc_read(rxd, 1, &word);
-		rt2x00_set_field32(&word, RXD_W1_BUFFER_ADDRESS,
-				   ring->entry[i].data_dma);
-		rt2x00_desc_write(rxd, 1, word);
-
-		rt2x00_desc_read(rxd, 0, &word);
-		rt2x00_set_field32(&word, RXD_W0_OWNER_NIC, 1);
-		rt2x00_desc_write(rxd, 0, word);
-	}
+	rt2x00_desc_read(rxd, 1, &word);
+	rt2x00_set_field32(&word, RXD_W1_BUFFER_ADDRESS, entry->data_dma);
+	rt2x00_desc_write(rxd, 1, word);
 
-	rt2x00_ring_index_clear(rt2x00dev->rx);
+	rt2x00_desc_read(rxd, 0, &word);
+	rt2x00_set_field32(&word, RXD_W0_OWNER_NIC, 1);
+	rt2x00_desc_write(rxd, 0, word);
 }
 
-static void rt2400pci_init_txring(struct rt2x00_dev *rt2x00dev, const int queue)
+static void rt2400pci_init_txentry(struct rt2x00_dev *rt2x00dev,
+				   struct data_entry *entry)
 {
-	struct data_ring *ring = rt2x00lib_get_ring(rt2x00dev, queue);
-	__le32 *txd;
-	unsigned int i;
+	__le32 *txd = entry->priv;
 	u32 word;
 
-	memset(ring->data_addr, 0x00, rt2x00_get_ring_size(ring));
-
-	for (i = 0; i < ring->stats.limit; i++) {
-		txd = ring->entry[i].priv;
-
-		rt2x00_desc_read(txd, 1, &word);
-		rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS,
-				   ring->entry[i].data_dma);
-		rt2x00_desc_write(txd, 1, word);
+	rt2x00_desc_read(txd, 1, &word);
+	rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS, entry->data_dma);
+	rt2x00_desc_write(txd, 1, word);
 
-		rt2x00_desc_read(txd, 2, &word);
-		rt2x00_set_field32(&word, TXD_W2_BUFFER_LENGTH,
-				   ring->data_size);
-		rt2x00_desc_write(txd, 2, word);
-
-		rt2x00_desc_read(txd, 0, &word);
-		rt2x00_set_field32(&word, TXD_W0_VALID, 0);
-		rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 0);
-		rt2x00_desc_write(txd, 0, word);
-	}
+	rt2x00_desc_read(txd, 2, &word);
+	rt2x00_set_field32(&word, TXD_W2_BUFFER_LENGTH, entry->ring->data_size);
+	rt2x00_desc_write(txd, 2, word);
 
-	rt2x00_ring_index_clear(ring);
+	rt2x00_desc_read(txd, 0, &word);
+	rt2x00_set_field32(&word, TXD_W0_VALID, 0);
+	rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 0);
+	rt2x00_desc_write(txd, 0, word);
 }
 
 static int rt2400pci_init_rings(struct rt2x00_dev *rt2x00dev)
@@ -658,15 +636,6 @@ static int rt2400pci_init_rings(struct rt2x00_dev *rt2x00dev)
 	u32 reg;
 
 	/*
-	 * Initialize rings.
-	 */
-	rt2400pci_init_rxring(rt2x00dev);
-	rt2400pci_init_txring(rt2x00dev, IEEE80211_TX_QUEUE_DATA0);
-	rt2400pci_init_txring(rt2x00dev, IEEE80211_TX_QUEUE_DATA1);
-	rt2400pci_init_txring(rt2x00dev, IEEE80211_TX_QUEUE_AFTER_BEACON);
-	rt2400pci_init_txring(rt2x00dev, IEEE80211_TX_QUEUE_BEACON);
-
-	/*
 	 * Initialize registers.
 	 */
 	rt2x00pci_register_read(rt2x00dev, TXCSR2, &reg);
@@ -1569,6 +1538,8 @@ static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = {
 	.probe_hw		= rt2400pci_probe_hw,
 	.initialize		= rt2x00pci_initialize,
 	.uninitialize		= rt2x00pci_uninitialize,
+	.init_rxentry		= rt2400pci_init_rxentry,
+	.init_txentry		= rt2400pci_init_txentry,
 	.set_device_state	= rt2400pci_set_device_state,
 	.rfkill_poll		= rt2400pci_rfkill_poll,
 	.link_stats		= rt2400pci_link_stats,
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 133967e..206b50f 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -683,55 +683,35 @@ dynamic_cca_tune:
 /*
  * Initialization functions.
  */
-static void rt2500pci_init_rxring(struct rt2x00_dev *rt2x00dev)
+static void rt2500pci_init_rxentry(struct rt2x00_dev *rt2x00dev,
+				   struct data_entry *entry)
 {
-	struct data_ring *ring = rt2x00dev->rx;
-	__le32 *rxd;
-	unsigned int i;
+	__le32 *rxd = entry->priv;
 	u32 word;
 
-	memset(ring->data_addr, 0x00, rt2x00_get_ring_size(ring));
-
-	for (i = 0; i < ring->stats.limit; i++) {
-		rxd = ring->entry[i].priv;
-
-		rt2x00_desc_read(rxd, 1, &word);
-		rt2x00_set_field32(&word, RXD_W1_BUFFER_ADDRESS,
-				   ring->entry[i].data_dma);
-		rt2x00_desc_write(rxd, 1, word);
-
-		rt2x00_desc_read(rxd, 0, &word);
-		rt2x00_set_field32(&word, RXD_W0_OWNER_NIC, 1);
-		rt2x00_desc_write(rxd, 0, word);
-	}
+	rt2x00_desc_read(rxd, 1, &word);
+	rt2x00_set_field32(&word, RXD_W1_BUFFER_ADDRESS, entry->data_dma);
+	rt2x00_desc_write(rxd, 1, word);
 
-	rt2x00_ring_index_clear(rt2x00dev->rx);
+	rt2x00_desc_read(rxd, 0, &word);
+	rt2x00_set_field32(&word, RXD_W0_OWNER_NIC, 1);
+	rt2x00_desc_write(rxd, 0, word);
 }
 
-static void rt2500pci_init_txring(struct rt2x00_dev *rt2x00dev, const int queue)
+static void rt2500pci_init_txentry(struct rt2x00_dev *rt2x00dev,
+				   struct data_entry *entry)
 {
-	struct data_ring *ring = rt2x00lib_get_ring(rt2x00dev, queue);
-	__le32 *txd;
-	unsigned int i;
+	__le32 *txd = entry->priv;
 	u32 word;
 
-	memset(ring->data_addr, 0x00, rt2x00_get_ring_size(ring));
-
-	for (i = 0; i < ring->stats.limit; i++) {
-		txd = ring->entry[i].priv;
+	rt2x00_desc_read(txd, 1, &word);
+	rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS, entry->data_dma);
+	rt2x00_desc_write(txd, 1, word);
 
-		rt2x00_desc_read(txd, 1, &word);
-		rt2x00_set_field32(&word, TXD_W1_BUFFER_ADDRESS,
-				   ring->entry[i].data_dma);
-		rt2x00_desc_write(txd, 1, word);
-
-		rt2x00_desc_read(txd, 0, &word);
-		rt2x00_set_field32(&word, TXD_W0_VALID, 0);
-		rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 0);
-		rt2x00_desc_write(txd, 0, word);
-	}
-
-	rt2x00_ring_index_clear(ring);
+	rt2x00_desc_read(txd, 0, &word);
+	rt2x00_set_field32(&word, TXD_W0_VALID, 0);
+	rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 0);
+	rt2x00_desc_write(txd, 0, word);
 }
 
 static int rt2500pci_init_rings(struct rt2x00_dev *rt2x00dev)
@@ -739,15 +719,6 @@ static int rt2500pci_init_rings(struct rt2x00_dev *rt2x00dev)
 	u32 reg;
 
 	/*
-	 * Initialize rings.
-	 */
-	rt2500pci_init_rxring(rt2x00dev);
-	rt2500pci_init_txring(rt2x00dev, IEEE80211_TX_QUEUE_DATA0);
-	rt2500pci_init_txring(rt2x00dev, IEEE80211_TX_QUEUE_DATA1);
-	rt2500pci_init_txring(rt2x00dev, IEEE80211_TX_QUEUE_AFTER_BEACON);
-	rt2500pci_init_txring(rt2x00dev, IEEE80211_TX_QUEUE_BEACON);
-
-	/*
 	 * Initialize registers.
 	 */
 	rt2x00pci_register_read(rt2x00dev, TXCSR2, &reg);
@@ -1878,6 +1849,8 @@ static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = {
 	.probe_hw		= rt2500pci_probe_hw,
 	.initialize		= rt2x00pci_initialize,
 	.uninitialize		= rt2x00pci_uninitialize,
+	.init_rxentry		= rt2500pci_init_rxentry,
+	.init_txentry		= rt2500pci_init_txentry,
 	.set_device_state	= rt2500pci_set_device_state,
 	.rfkill_poll		= rt2500pci_rfkill_poll,
 	.link_stats		= rt2500pci_link_stats,
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 2a4e939..1b05b8a 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -920,8 +920,6 @@ static int rt2500usb_enable_radio(struct rt2x00_dev *rt2x00dev)
 		return -EIO;
 	}
 
-	rt2x00usb_enable_radio(rt2x00dev);
-
 	/*
 	 * Enable LED
 	 */
@@ -1776,6 +1774,8 @@ static const struct rt2x00lib_ops rt2500usb_rt2x00_ops = {
 	.probe_hw		= rt2500usb_probe_hw,
 	.initialize		= rt2x00usb_initialize,
 	.uninitialize		= rt2x00usb_uninitialize,
+	.init_rxentry		= rt2x00usb_init_rxentry,
+	.init_txentry		= rt2x00usb_init_txentry,
 	.set_device_state	= rt2500usb_set_device_state,
 	.link_stats		= rt2500usb_link_stats,
 	.reset_tuner		= rt2500usb_reset_tuner,
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 0795332..d8585a0 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -474,6 +474,14 @@ struct rt2x00lib_ops {
 	void (*uninitialize) (struct rt2x00_dev *rt2x00dev);
 
 	/*
+	 * Ring initialization handlers
+	 */
+	void (*init_rxentry) (struct rt2x00_dev *rt2x00dev,
+			      struct data_entry *entry);
+	void (*init_txentry) (struct rt2x00_dev *rt2x00dev,
+			      struct data_entry *entry);
+
+	/*
 	 * Radio control handlers.
 	 */
 	int (*set_device_state) (struct rt2x00_dev *rt2x00dev,
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index a114212..b26c634 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -103,6 +103,46 @@ void rt2x00lib_reset_link_tuner(struct rt2x00_dev *rt2x00dev)
 }
 
 /*
+ * Ring initialization
+ */
+static void rt2x00lib_init_rxrings(struct rt2x00_dev *rt2x00dev)
+{
+	struct data_ring *ring = rt2x00dev->rx;
+	unsigned int i;
+
+	if (!rt2x00dev->ops->lib->init_rxentry)
+		return;
+
+	if (ring->data_addr)
+		memset(ring->data_addr, 0, rt2x00_get_ring_size(ring));
+
+	for (i = 0; i < ring->stats.limit; i++)
+		rt2x00dev->ops->lib->init_rxentry(rt2x00dev, &ring->entry[i]);
+
+	rt2x00_ring_index_clear(ring);
+}
+
+static void rt2x00lib_init_txrings(struct rt2x00_dev *rt2x00dev)
+{
+	struct data_ring *ring;
+	unsigned int i;
+
+	if (!rt2x00dev->ops->lib->init_txentry)
+		return;
+
+	txringall_for_each(rt2x00dev, ring) {
+		if (ring->data_addr)
+			memset(ring->data_addr, 0, rt2x00_get_ring_size(ring));
+
+		for (i = 0; i < ring->stats.limit; i++)
+			rt2x00dev->ops->lib->init_txentry(rt2x00dev,
+							  &ring->entry[i]);
+
+		rt2x00_ring_index_clear(ring);
+	}
+}
+
+/*
  * Radio control handlers.
  */
 int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev)
@@ -118,6 +158,12 @@ int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev)
 		return 0;
 
 	/*
+	 * Initialize all data rings.
+	 */
+	rt2x00lib_init_rxrings(rt2x00dev);
+	rt2x00lib_init_txrings(rt2x00dev);
+
+	/*
 	 * Enable radio.
 	 */
 	status = rt2x00dev->ops->lib->set_device_state(rt2x00dev,
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 8a6218f..d15d469 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -326,43 +326,6 @@ skip_entry:
 /*
  * Radio handlers
  */
-void rt2x00usb_enable_radio(struct rt2x00_dev *rt2x00dev)
-{
-	struct usb_device *usb_dev =
-	    interface_to_usbdev(rt2x00dev_usb(rt2x00dev));
-	struct data_ring *ring;
-	struct data_entry *entry;
-	unsigned int i;
-
-	/*
-	 * Initialize the TX rings
-	 */
-	txringall_for_each(rt2x00dev, ring) {
-		for (i = 0; i < ring->stats.limit; i++)
-			ring->entry[i].flags = 0;
-
-		rt2x00_ring_index_clear(ring);
-	}
-
-	/*
-	 * Initialize and start the RX ring.
-	 */
-	rt2x00_ring_index_clear(rt2x00dev->rx);
-
-	for (i = 0; i < rt2x00dev->rx->stats.limit; i++) {
-		entry = &rt2x00dev->rx->entry[i];
-
-		usb_fill_bulk_urb(entry->priv, usb_dev,
-				  usb_rcvbulkpipe(usb_dev, 1),
-				  entry->skb->data, entry->skb->len,
-				  rt2x00usb_interrupt_rxdone, entry);
-
-		__set_bit(ENTRY_OWNER_NIC, &entry->flags);
-		usb_submit_urb(entry->priv, GFP_ATOMIC);
-	}
-}
-EXPORT_SYMBOL_GPL(rt2x00usb_enable_radio);
-
 void rt2x00usb_disable_radio(struct rt2x00_dev *rt2x00dev)
 {
 	struct data_ring *ring;
@@ -384,6 +347,29 @@ EXPORT_SYMBOL_GPL(rt2x00usb_disable_radio);
 /*
  * Device initialization handlers.
  */
+void rt2x00usb_init_rxentry(struct rt2x00_dev *rt2x00dev,
+			    struct data_entry *entry)
+{
+	struct usb_device *usb_dev =
+	     interface_to_usbdev(rt2x00dev_usb(rt2x00dev));
+
+	usb_fill_bulk_urb(entry->priv, usb_dev,
+			  usb_rcvbulkpipe(usb_dev, 1),
+			  entry->skb->data, entry->skb->len,
+			  rt2x00usb_interrupt_rxdone, entry);
+
+	__set_bit(ENTRY_OWNER_NIC, &entry->flags);
+	usb_submit_urb(entry->priv, GFP_ATOMIC);
+}
+EXPORT_SYMBOL_GPL(rt2x00usb_init_rxentry);
+
+void rt2x00usb_init_txentry(struct rt2x00_dev *rt2x00dev,
+			    struct data_entry *entry)
+{
+	entry->flags = 0;
+}
+EXPORT_SYMBOL_GPL(rt2x00usb_init_txentry);
+
 static int rt2x00usb_alloc_urb(struct rt2x00_dev *rt2x00dev,
 			       struct data_ring *ring)
 {
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.h b/drivers/net/wireless/rt2x00/rt2x00usb.h
index 2fa45c5..e40df40 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.h
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.h
@@ -154,7 +154,6 @@ static inline int rt2x00usb_eeprom_read(struct rt2x00_dev *rt2x00dev,
 /*
  * Radio handlers
  */
-void rt2x00usb_enable_radio(struct rt2x00_dev *rt2x00dev);
 void rt2x00usb_disable_radio(struct rt2x00_dev *rt2x00dev);
 
 /*
@@ -167,6 +166,10 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
 /*
  * Device initialization handlers.
  */
+void rt2x00usb_init_rxentry(struct rt2x00_dev *rt2x00dev,
+			    struct data_entry *entry);
+void rt2x00usb_init_txentry(struct rt2x00_dev *rt2x00dev,
+			    struct data_entry *entry);
 int rt2x00usb_initialize(struct rt2x00_dev *rt2x00dev);
 void rt2x00usb_uninitialize(struct rt2x00_dev *rt2x00dev);
 
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 47b7430..b2dde4d 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -989,66 +989,46 @@ static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev, void *data,
 	return 0;
 }
 
-static void rt61pci_init_rxring(struct rt2x00_dev *rt2x00dev)
+static void rt61pci_init_rxentry(struct rt2x00_dev *rt2x00dev,
+				 struct data_entry *entry)
 {
-	struct data_ring *ring = rt2x00dev->rx;
-	__le32 *rxd;
-	unsigned int i;
+	__le32 *rxd = entry->priv;
 	u32 word;
 
-	memset(ring->data_addr, 0x00, rt2x00_get_ring_size(ring));
-
-	for (i = 0; i < ring->stats.limit; i++) {
-		rxd = ring->entry[i].priv;
-
-		rt2x00_desc_read(rxd, 5, &word);
-		rt2x00_set_field32(&word, RXD_W5_BUFFER_PHYSICAL_ADDRESS,
-				   ring->entry[i].data_dma);
-		rt2x00_desc_write(rxd, 5, word);
-
-		rt2x00_desc_read(rxd, 0, &word);
-		rt2x00_set_field32(&word, RXD_W0_OWNER_NIC, 1);
-		rt2x00_desc_write(rxd, 0, word);
-	}
+	rt2x00_desc_read(rxd, 5, &word);
+	rt2x00_set_field32(&word, RXD_W5_BUFFER_PHYSICAL_ADDRESS,
+			   entry->data_dma);
+	rt2x00_desc_write(rxd, 5, word);
 
-	rt2x00_ring_index_clear(rt2x00dev->rx);
+	rt2x00_desc_read(rxd, 0, &word);
+	rt2x00_set_field32(&word, RXD_W0_OWNER_NIC, 1);
+	rt2x00_desc_write(rxd, 0, word);
 }
 
-static void rt61pci_init_txring(struct rt2x00_dev *rt2x00dev, const int queue)
+static void rt61pci_init_txentry(struct rt2x00_dev *rt2x00dev,
+				 struct data_entry *entry)
 {
-	struct data_ring *ring = rt2x00lib_get_ring(rt2x00dev, queue);
-	__le32 *txd;
-	unsigned int i;
+	__le32 *txd = entry->priv;
 	u32 word;
 
-	memset(ring->data_addr, 0x00, rt2x00_get_ring_size(ring));
-
-	for (i = 0; i < ring->stats.limit; i++) {
-		txd = ring->entry[i].priv;
-
-		rt2x00_desc_read(txd, 1, &word);
-		rt2x00_set_field32(&word, TXD_W1_BUFFER_COUNT, 1);
-		rt2x00_desc_write(txd, 1, word);
-
-		rt2x00_desc_read(txd, 5, &word);
-		rt2x00_set_field32(&word, TXD_W5_PID_TYPE,
-				   ring->queue_idx);
-		rt2x00_set_field32(&word, TXD_W5_PID_SUBTYPE,
-				   ring->entry[i].entry_idx);
-		rt2x00_desc_write(txd, 5, word);
+	rt2x00_desc_read(txd, 1, &word);
+	rt2x00_set_field32(&word, TXD_W1_BUFFER_COUNT, 1);
+	rt2x00_desc_write(txd, 1, word);
 
-		rt2x00_desc_read(txd, 6, &word);
-		rt2x00_set_field32(&word, TXD_W6_BUFFER_PHYSICAL_ADDRESS,
-				   ring->entry[i].data_dma);
-		rt2x00_desc_write(txd, 6, word);
+	rt2x00_desc_read(txd, 5, &word);
+	rt2x00_set_field32(&word, TXD_W5_PID_TYPE, entry->ring->queue_idx);
+	rt2x00_set_field32(&word, TXD_W5_PID_SUBTYPE, entry->entry_idx);
+	rt2x00_desc_write(txd, 5, word);
 
-		rt2x00_desc_read(txd, 0, &word);
-		rt2x00_set_field32(&word, TXD_W0_VALID, 0);
-		rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 0);
-		rt2x00_desc_write(txd, 0, word);
-	}
+	rt2x00_desc_read(txd, 6, &word);
+	rt2x00_set_field32(&word, TXD_W6_BUFFER_PHYSICAL_ADDRESS,
+			   entry->data_dma);
+	rt2x00_desc_write(txd, 6, word);
 
-	rt2x00_ring_index_clear(ring);
+	rt2x00_desc_read(txd, 0, &word);
+	rt2x00_set_field32(&word, TXD_W0_VALID, 0);
+	rt2x00_set_field32(&word, TXD_W0_OWNER_NIC, 0);
+	rt2x00_desc_write(txd, 0, word);
 }
 
 static int rt61pci_init_rings(struct rt2x00_dev *rt2x00dev)
@@ -1056,16 +1036,6 @@ static int rt61pci_init_rings(struct rt2x00_dev *rt2x00dev)
 	u32 reg;
 
 	/*
-	 * Initialize rings.
-	 */
-	rt61pci_init_rxring(rt2x00dev);
-	rt61pci_init_txring(rt2x00dev, IEEE80211_TX_QUEUE_DATA0);
-	rt61pci_init_txring(rt2x00dev, IEEE80211_TX_QUEUE_DATA1);
-	rt61pci_init_txring(rt2x00dev, IEEE80211_TX_QUEUE_DATA2);
-	rt61pci_init_txring(rt2x00dev, IEEE80211_TX_QUEUE_DATA3);
-	rt61pci_init_txring(rt2x00dev, IEEE80211_TX_QUEUE_DATA4);
-
-	/*
 	 * Initialize registers.
 	 */
 	rt2x00pci_register_read(rt2x00dev, TX_RING_CSR0, &reg);
@@ -2487,6 +2457,8 @@ static const struct rt2x00lib_ops rt61pci_rt2x00_ops = {
 	.load_firmware		= rt61pci_load_firmware,
 	.initialize		= rt2x00pci_initialize,
 	.uninitialize		= rt2x00pci_uninitialize,
+	.init_rxentry		= rt61pci_init_rxentry,
+	.init_txentry		= rt61pci_init_txentry,
 	.set_device_state	= rt61pci_set_device_state,
 	.rfkill_poll		= rt61pci_rfkill_poll,
 	.link_stats		= rt61pci_link_stats,
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index beaa264..78217dc 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1136,8 +1136,6 @@ static int rt73usb_enable_radio(struct rt2x00_dev *rt2x00dev)
 		return -EIO;
 	}
 
-	rt2x00usb_enable_radio(rt2x00dev);
-
 	/*
 	 * Enable LED
 	 */
@@ -2033,6 +2031,8 @@ static const struct rt2x00lib_ops rt73usb_rt2x00_ops = {
 	.load_firmware		= rt73usb_load_firmware,
 	.initialize		= rt2x00usb_initialize,
 	.uninitialize		= rt2x00usb_uninitialize,
+	.init_rxentry		= rt2x00usb_init_rxentry,
+	.init_txentry		= rt2x00usb_init_txentry,
 	.set_device_state	= rt73usb_set_device_state,
 	.link_stats		= rt73usb_link_stats,
 	.reset_tuner		= rt73usb_reset_tuner,
-- 
1.5.3.7

[PATCH 11/12] rt2x00: Correctly initialize data and desc pointer

[Ivo van Doorn]

rt2500usb and rt73usb store the descriptor in different
places. This means we should move the initialization of
the 2 pointers to the driver callback function fill_rxdone().

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
 drivers/net/wireless/rt2x00/rt2500usb.c |   12 ++++++++++++
 drivers/net/wireless/rt2x00/rt2x00usb.c |    2 --
 drivers/net/wireless/rt2x00/rt73usb.c   |    7 +++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 1b05b8a..2f166c8 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1113,6 +1113,7 @@ static void rt2500usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
 static void rt2500usb_fill_rxdone(struct data_entry *entry,
 				  struct rxdata_entry_desc *desc)
 {
+	struct skb_desc *skbdesc = get_skb_desc(entry->skb);
 	struct urb *urb = entry->priv;
 	__le32 *rxd = (__le32 *)(entry->skb->data +
 				 (urb->actual_length - entry->ring->desc_size));
@@ -1137,6 +1138,17 @@ static void rt2500usb_fill_rxdone(struct data_entry *entry,
 	desc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
 	desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
 	desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
+
+	/*
+	 * Trim the skb to clear the descriptor area.
+	 */
+	skb_pull(entry->skb, entry->ring->desc_size);
+
+	/*
+	 * Set descriptor and data pointer.
+	 */
+	skbdesc->desc = entry->skb->data + skbdesc->data_len;
+	skbdesc->data = entry->skb->data;
 }
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index d15d469..8aab28d 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -296,8 +296,6 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
 	skbdesc = get_skb_desc(entry->skb);
 	skbdesc->desc_len = entry->ring->desc_size;
 	skbdesc->data_len = entry->skb->len;
-	skbdesc->desc = entry->skb->data - skbdesc->desc_len;
-	skbdesc->data = entry->skb->data;
 	skbdesc->ring = ring;
 	skbdesc->entry = entry;
 
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 78217dc..47ed307 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1376,6 +1376,7 @@ static int rt73usb_agc_to_rssi(struct rt2x00_dev *rt2x00dev, int rxd_w1)
 static void rt73usb_fill_rxdone(struct data_entry *entry,
 			        struct rxdata_entry_desc *desc)
 {
+	struct skb_desc *skbdesc = get_skb_desc(entry->skb);
 	__le32 *rxd = (__le32 *)entry->skb->data;
 	u32 word0;
 	u32 word1;
@@ -1400,6 +1401,12 @@ static void rt73usb_fill_rxdone(struct data_entry *entry,
 	 * Pull the skb to clear the descriptor area.
 	 */
 	skb_pull(entry->skb, entry->ring->desc_size);
+
+	/*
+	 * Set descriptor and data pointer.
+	 */
+	skbdesc->desc = entry->skb->data - skbdesc->desc_len;
+	skbdesc->data = entry->skb->data;
 }
 
 /*
-- 
1.5.3.7

[PATCH 12/12] rt2x00: Release rt2x00 2.0.14

[Ivo van Doorn]

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
 drivers/net/wireless/rt2x00/rt2x00.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index d8585a0..94a8a7c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -43,7 +43,7 @@
 /*
  * Module information.
  */
-#define DRV_VERSION	"2.0.13"
+#define DRV_VERSION	"2.0.14"
 #define DRV_PROJECT	"http://rt2x00.serialmonkey.com"
 
 /*
-- 
1.5.3.7

Re: [Rt2400-devel] Please pull 'upstream' branch of rt2x00

[Will Dyson]

On Jan 6, 2008 5:37 PM, Ivo van Doorn <ivdoorn@gmail.com> wrote:
> Hi John,
>
> Here is the 2.0.14 release of rt2x00. Again lots of bugfixes,
> and unfortunately we are still not there yet. I am afraid
> rt2500usb and rt61pci are lost causes for the 2.6.24 release,
> they are both broken, and I haven't figured out what is causing
> this.

Hi Ivo,

Sorry to be out of the loop, but what is wrong with rt61pci? It works
really really well for me, using John's "everything" branch.

Hmm. Looking at Linus's tree, I can see that rt61pci is missing at
least 1 critical fix from Mattias Nissler that has been in
wireless-2.6 for a long time now.

rt2x00: Allow rt61 to catch up after a missing tx report

I'd be pretty disappointed if we released 2.6.24 without this. It is a
simple fix for a really obnoxious problem (although one that triggers
rarely on my hardware).

There are also a bunch of antenna selection fixes that never went
upstream. These are required for my card to operate well at rates
greater than 1Mbit, even when fairly close to the AP.

But aside from these issues, the latest 2.6.24-rc7 seems ok for me. My
testing of it is somewhat limited, due to the terrible performance.
But I can associate, browse the web and run iperf tests.

-- 
Will Dyson

Re: [Rt2400-devel] Please pull 'upstream' branch of rt2x00

[John W. Linville]

On Thu, Jan 10, 2008 at 06:52:40AM -0500, Will Dyson wrote:

> Hmm. Looking at Linus's tree, I can see that rt61pci is missing at
> least 1 critical fix from Mattias Nissler that has been in
> wireless-2.6 for a long time now.
> 
> rt2x00: Allow rt61 to catch up after a missing tx report
> 
> I'd be pretty disappointed if we released 2.6.24 without this. It is a
> simple fix for a really obnoxious problem (although one that triggers
> rarely on my hardware).

This one can be cherry-picked fairly easily for 2.6.24.  Ivo, any
reason not to do that?
 
> There are also a bunch of antenna selection fixes that never went
> upstream. These are required for my card to operate well at rates
> greater than 1Mbit, even when fairly close to the AP.

Can you identify specific patches?  If so I can evaluate whether they
apply easily to 2.6.24 or if they need significant rework.

Thanks,

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

Re: [Rt2400-devel] Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi,

> > Here is the 2.0.14 release of rt2x00. Again lots of bugfixes,
> > and unfortunately we are still not there yet. I am afraid
> > rt2500usb and rt61pci are lost causes for the 2.6.24 release,
> > they are both broken, and I haven't figured out what is causing
> > this.
> 
> Hi Ivo,
> 
> Sorry to be out of the loop, but what is wrong with rt61pci? It works
> really really well for me, using John's "everything" branch.

My tests indicate rt61pci is currently not working, I just did some regression
testing and it seems the 2.0.14 version is to blame. I still have to run git-bisect
to determine the exact patch that broke it.

Ivo

Re: [Rt2400-devel] Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

On Thursday 10 January 2008, John W. Linville wrote:
> On Thu, Jan 10, 2008 at 06:52:40AM -0500, Will Dyson wrote:
> 
> > Hmm. Looking at Linus's tree, I can see that rt61pci is missing at
> > least 1 critical fix from Mattias Nissler that has been in
> > wireless-2.6 for a long time now.
> > 
> > rt2x00: Allow rt61 to catch up after a missing tx report
> > 
> > I'd be pretty disappointed if we released 2.6.24 without this. It is a
> > simple fix for a really obnoxious problem (although one that triggers
> > rarely on my hardware).
> 
> This one can be cherry-picked fairly easily for 2.6.24.  Ivo, any
> reason not to do that?

Nope, if it can be merged into 2.6.24 easily it should indeed go upstream.

> > There are also a bunch of antenna selection fixes that never went
> > upstream. These are required for my card to operate well at rates
> > greater than 1Mbit, even when fairly close to the AP.
> 
> Can you identify specific patches?  If so I can evaluate whether they
> apply easily to 2.6.24 or if they need significant rework.

I'm afraid the antenna code concerns the antenna diversity which is quite
a lot of code. I'm not sure how easily it can be merged, but I expect it to
be somewhat troublesome.

Ivo

Re: [Rt2400-devel] Please pull 'upstream' branch of rt2x00

[Stefan Lippers-Hollmann]

Hi

On Donnerstag, 10. Januar 2008, Will Dyson wrote:
[...]
> Sorry to be out of the loop, but what is wrong with rt61pci? It works
> really really well for me, using John's "everything" branch.
> 
> Hmm. Looking at Linus's tree, I can see that rt61pci is missing at
> least 1 critical fix from Mattias Nissler that has been in
> wireless-2.6 for a long time now.
> 
> rt2x00: Allow rt61 to catch up after a missing tx report
> 
> I'd be pretty disappointed if we released 2.6.24 without this. It is a
> simple fix for a really obnoxious problem (although one that triggers
> rarely on my hardware).

The same goes for (which can be easily rediffed against linux-2.6):
	[PATCH 06/12] rt2x00: Put 802.11 data on 4 byte boundary
without it, at least rt61pci, rt73usb and rt2500usb (plain 
2.6.24-rc7-git2) trigger the well known:

WARNING: at net/mac80211/rx.c:1486 __ieee80211_rx()
Pid: 0, comm: swapper Not tainted 2.6.24-rc7-git2-slh64-smp-1 #1

Call Trace:
 <IRQ>  [<ffffffff80232e4a>] __wake_up_common+0x5a/0x90
 [<ffffffff881fed9e>] :mac80211:__ieee80211_rx+0xbde/0xd00
 [<ffffffff880cb3e6>] :ehci_hcd:ehci_work+0x5d6/0x8e0
 [<ffffffff881f028b>] :mac80211:ieee80211_tasklet_handler+0xbb/0x120
 [<ffffffff80243507>] tasklet_action+0x47/0xb0
 [<ffffffff80243415>] __do_softirq+0x75/0xe0
 [<ffffffff8020d62c>] call_softirq+0x1c/0x30
 [<ffffffff8020f9f5>] do_softirq+0x35/0x90
 [<ffffffff802432a6>] irq_exit+0x96/0xa0
 [<ffffffff8020fad0>] do_IRQ+0x80/0x100
 [<ffffffff8020af60>] default_idle+0x0/0x40
 [<ffffffff8020af60>] default_idle+0x0/0x40
 [<ffffffff8020c981>] ret_from_intr+0x0/0xa
 <EOI>  [<ffffffff80220e60>] lapic_next_event+0x0/0x10
 [<ffffffff8020af89>] default_idle+0x29/0x40
 [<ffffffff8020b00f>] cpu_idle+0x6f/0xe0

> There are also a bunch of antenna selection fixes that never went
> upstream. These are required for my card to operate well at rates
> greater than 1Mbit, even when fairly close to the AP.
> 
> But aside from these issues, the latest 2.6.24-rc7 seems ok for me. My
> testing of it is somewhat limited, due to the terrible performance.
> But I can associate, browse the web and run iperf tests.

I can just agree to this statement, rt73usb works really well (at steady 
~2.4 MB/s) and rt61pci is the first driver to actually work at all (yes, 
the same performance issues, but rt61-legacy freezes using wpa2psk; 
rt2500usb seems to have more problems).

All tests based on plain 2.6.24-rc7-git2 (amd64 and wpa2psk/ CCMP) + the 
following patches:
- [PATCH 06/12] rt2x00: Put 802.11 data on 4 byte boundary
- [PATCH] rt2x00: Corectly initialize rt2500usb MAC

Thanks a lot
	Stefan Lippers-Hollmann

Re: [PATCH 06/12] rt2x00: Put 802.11 data on 4 byte boundary

[Johannes Berg]

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

Sorry I'm late in noticing this :\

> +		/*
> +		 * The data behind the ieee80211 header must be
> +		 * aligned on a 4 byte boundary.
> +		 */
> +		align = NET_IP_ALIGN + (2 * (header_size % 4 == 0));

I don't think you should be using NET_IP_ALIGN at all, I think the code
should be just

		align = header_size % 4;

(which will evaluate to two or four).

See, NET_IP_ALIGN is 2 because ethernet headers are 14 bytes long, and 2
plus 14 gives 16 which is divisible by four.

I have, so far, in mac80211 forced you to align the 802.11 data payload
to a four-byte boundary *even on powerpc* which is the only platform
where NET_IP_ALIGN is not two (it is zero because DMA sucks when done to
unaligned addresses on some powerpc machines).

We are, however, not concerned with ethernet frames here at all! Hence,
NET_IP_ALIGN is pretty much useless because it's designed for the
ethernet case.

I think Broadcom hardware really represents the ideal case here: The sum
of the lengths of all headers including hardware/firmware receive
header, plcp information and 802.11 header is always a multiple of four,
if necessary the hardware/firmware header is padded (by two bytes) to
achieve this. This means we can always do "perfect" DMA right to the
beginning of the buffer and always get the right IP header alignment.

Once you deviate from that ideal case, performance suffers. Either
because you need to move around data or because you have to do unaligned
loads. The latter I have currently disallowed in mac80211 (via that
WARN_ON_ONCE) because most drivers got it wrong and hence won't function
on machines that require or force alignment.

In any case, NET_IP_ALIGN is really designed for ethernet and DMA. Since
we're not doing ethernet, it's not important. Since you're not doing DMA
here, it's even less important. If it becomes possible for you to do
DMA, you should probably do it right into the start of a buffer and
memmove() the data a bit when necessary to achieve 4-byte alignment.

Once you have done that, we can talk about possibly relaxing the
WARN_ON_ONCE() in mac80211 a bit so you don't have to memmove() the data
on machines where unaligned loads are possible. Then we can investigate
which hurts performance more, but I guess it'll be machine-dependent (I
would guess that enough cache means a memmove is fast or at least
amortized later when we load the data anyway, unaligned loads on the
other hand hurt every time the IP stack needs a field)

Now, I can see one case where you could again use NET_IP_ALIGN, but it
has a bunch of preconditions:
 - you do DMA right into the skb
 - you have a RX header that is divisible by four
 - you decide that QoS frames are going to be more common than non-QoS

Initially, these conditions mean that you'd ask the machine to do DMA
into the start of the skb + 2, because you want to have the IP data
aligned properly in the QoS case. Then, however, you should use
NET_IP_ALIGN instead of the two and not do any memmove at all. But
seeing that's only relevant for some powerpc machines and wireless
hardware isn't fast enough yet to matter, I don't think it makes a
difference.

We should, however, reach out to vendors and ask them to do the required
padding in firmware/hardware.

This leads me to an interesting question for A-MSDU packets, but I'll
write another mail about that.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: [PATCH 06/12] rt2x00: Put 802.11 data on 4 byte boundary

[Ivo van Doorn]

Hi,

> Sorry I'm late in noticing this :\
> 
> > +		/*
> > +		 * The data behind the ieee80211 header must be
> > +		 * aligned on a 4 byte boundary.
> > +		 */
> > +		align = NET_IP_ALIGN + (2 * (header_size % 4 == 0));
> 
> I don't think you should be using NET_IP_ALIGN at all, I think the code
> should be just
> 
> 		align = header_size % 4;
> 
> (which will evaluate to two or four).

Makes sense. I'll fix this asap.

> I have, so far, in mac80211 forced you to align the 802.11 data payload
> to a four-byte boundary *even on powerpc* which is the only platform
> where NET_IP_ALIGN is not two (it is zero because DMA sucks when done to
> unaligned addresses on some powerpc machines).

Ouch, that would make rt2x00usb panicking as soon as it is used when
NET_IP_ALIGN in 0 and alignment is needed. :S
This will be fixed asap as well.

Thanks,

Ivo

Re: [Rt2400-devel] Please pull 'upstream' branch of rt2x00

[Will Dyson]

On Jan 10, 2008 10:46 AM, John W. Linville <linville@tuxdriver.com> wrote:
> On Thu, Jan 10, 2008 at 06:52:40AM -0500, Will Dyson wrote:
> > There are also a bunch of antenna selection fixes that never went
> > upstream. These are required for my card to operate well at rates
> > greater than 1Mbit, even when fairly close to the AP.
>
> Can you identify specific patches?  If so I can evaluate whether they
> apply easily to 2.6.24 or if they need significant rework.

rt2x00: Rework rt61 antenna selection
(ca9aaeec2d36dd4a00fea6443c53e935cbfa59ef)

However, it definitely depends on

rt2x00: Split rt61/rt73 antenna selection into RX and TX antenna
(9da4cdaefb5e8e2e3be813d94ce7b401e60ff391)

This patch itself has further dependencies:
[PATCH] rt2x00: Correctly translate mac80211 antenna setup to rt2x00
[PATCH] rt2x00: Move quality statistics into seperate structure).

It looks fairly easy to merge around that last quality statistics
patch. But I am uncertain if it is a good idea. I can try it and post
the result if you are interested.

-- 
Will Dyson

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is the 2.1.0 release of rt2x00.
The most important changes in this release:
 - Queue handling overhaul
 - Multiple virtual AP interfaces support for rt61 and rt73
 - LED class support
 - Adhoc & master mode enabled

Note that this patch series is _not_ intended for 2.6.25,
a lot might still be broken because the code has changed so much.
Adhoc and master mode is only enabled for testing purposes, in no way
it means that it is working for all drivers...

With these changes adding support for rt2800pci and rt2800usb will
be easier as well. Hopefully I can soon provide an initial version for
those 2 drivers as well.

All indivual patches can also be found here:
http://kernel.org//pub/linux/kernel/people/ivd/rt2x00-2.1.0/

Ivo

---

The following changes since commit e0e6138382c56aa99a1aabe5dddddbb332b5a4f8:
  Stefano Brivio (1):
        rc80211-pid: fix rate adjustment

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Adam Baker (1):
      rt2x00: don't write past the end when writing short descriptors on rt61

Ivo van Doorn (18):
      rt2x00: Update copyright notice
      rt2x00: Queue handling overhaul
      rt2x00: Add new USB ID to rt2500usb
      rt2x00: Fix tx parameter initialization
      rt2x00: Enable master and adhoc mode again
      rt2x00: Driver requiring firmware should select crc algo
      rt2x00: Add per-interface structure
      rt2x00: Rate structure overhaul
      rt2x00: Remove HWMODE_{A,B,G}
      rt2x00: Remove TX_MGMT queue usage
      rt2x00: Initialize QID from queue->qid
      rt2x00: Use ieee80211_channel_to_frequency()
      rt2x00: Make use of MAC80211_LED_TRIGGERS
      rt2x00: Enable LED class support for rt2500usb/rt73usb
      rt2x00: Fix rate initialization
      rt2x00: Move beacon and atim queue defines into rt2x00
      rt2x00: Fix queue index handling
      rt2x00: Release rt2x00 2.1.0

 drivers/net/wireless/rt2x00/Kconfig          |   43 ++
 drivers/net/wireless/rt2x00/Makefile         |    6 +-
 drivers/net/wireless/rt2x00/rt2400pci.c      |  431 +++++++++------
 drivers/net/wireless/rt2x00/rt2400pci.h      |    2 +-
 drivers/net/wireless/rt2x00/rt2500pci.c      |  436 +++++++++------
 drivers/net/wireless/rt2x00/rt2500pci.h      |    2 +-
 drivers/net/wireless/rt2x00/rt2500usb.c      |  497 ++++++++++--------
 drivers/net/wireless/rt2x00/rt2500usb.h      |    5 +-
 drivers/net/wireless/rt2x00/rt2x00.h         |  288 ++++++-----
 drivers/net/wireless/rt2x00/rt2x00config.c   |  140 +++---
 drivers/net/wireless/rt2x00/rt2x00debug.c    |   34 +-
 drivers/net/wireless/rt2x00/rt2x00debug.h    |    2 +-
 drivers/net/wireless/rt2x00/rt2x00dev.c      |  756 +++++++++++---------------
 drivers/net/wireless/rt2x00/rt2x00dump.h     |    8 +-
 drivers/net/wireless/rt2x00/rt2x00firmware.c |   43 ++-
 drivers/net/wireless/rt2x00/rt2x00leds.c     |  217 ++++++++
 drivers/net/wireless/rt2x00/rt2x00leds.h     |   63 +++
 drivers/net/wireless/rt2x00/rt2x00lib.h      |  100 ++++-
 drivers/net/wireless/rt2x00/rt2x00mac.c      |  221 +++++---
 drivers/net/wireless/rt2x00/rt2x00pci.c      |  238 ++++-----
 drivers/net/wireless/rt2x00/rt2x00pci.h      |   57 ++-
 drivers/net/wireless/rt2x00/rt2x00queue.c    |  295 ++++++++++
 drivers/net/wireless/rt2x00/rt2x00queue.h    |  447 +++++++++++++++
 drivers/net/wireless/rt2x00/rt2x00reg.h      |   75 +---
 drivers/net/wireless/rt2x00/rt2x00rfkill.c   |    2 +-
 drivers/net/wireless/rt2x00/rt2x00ring.h     |  290 ----------
 drivers/net/wireless/rt2x00/rt2x00usb.c      |  345 ++++++++-----
 drivers/net/wireless/rt2x00/rt2x00usb.h      |  179 +++++--
 drivers/net/wireless/rt2x00/rt61pci.c        |  601 +++++++++++----------
 drivers/net/wireless/rt2x00/rt61pci.h        |   21 +-
 drivers/net/wireless/rt2x00/rt73usb.c        |  468 +++++++++-------
 drivers/net/wireless/rt2x00/rt73usb.h        |   20 +-
 32 files changed, 3831 insertions(+), 2501 deletions(-)
 create mode 100644 drivers/net/wireless/rt2x00/rt2x00leds.c
 create mode 100644 drivers/net/wireless/rt2x00/rt2x00leds.h
 create mode 100644 drivers/net/wireless/rt2x00/rt2x00queue.c
 create mode 100644 drivers/net/wireless/rt2x00/rt2x00queue.h
 delete mode 100644 drivers/net/wireless/rt2x00/rt2x00ring.h

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is a quick followup release labeled 2.1.1. The previous release
contained many bugs as it was mostly untested. Result was there
were critical issues with it, of which some have now been fixed.

The most critical issues are random panics due to corrupt memory access,
at the moment none of the drivers are displaying any activity yet where
rt73usb is still crashing at random times.

Ivo

---

The following changes since commit d86916b7d36c4f0db8634fcc17fe2d747b317f17:
  John W. Linville (1):
        Merge branch 'at76' into everything

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Adam Baker (1):
      rt2x00: correct address calc for queue private data

Ivo van Doorn (13):
      rt2x00: Fix invalid DMA free
      rt2x00: Make rt2x00 less verbose
      rt2x00: Remove MGMT ring initialization
      rt2x00: Select CONFIG_NEW_LEDS
      rt2x00: make csr_cache and csr_addr an union
      rt2x00: Fix scheduling while atomic errors in usb drivers
      rt2x00: Add queue statistics to debugfs
      rt2x00: Fix typo in debug statement
      rt2x00: Fix skbdesc->data_len initialization
      rt2x00: Fix queue->qid initialization
      rt2x00: Cleanup Makefile
      rt2x00: Kill guardian urb during disable_radio
      rt2x00: Release rt2x00 2.1.1

 drivers/net/wireless/rt2x00/Kconfig       |    1 +
 drivers/net/wireless/rt2x00/Makefile      |   41 +++++-------
 drivers/net/wireless/rt2x00/rt2400pci.c   |    4 -
 drivers/net/wireless/rt2x00/rt2500pci.c   |    4 -
 drivers/net/wireless/rt2x00/rt2500usb.c   |    6 +--
 drivers/net/wireless/rt2x00/rt2x00.h      |   12 ++--
 drivers/net/wireless/rt2x00/rt2x00debug.c |   90 ++++++++++++++++++++++----
 drivers/net/wireless/rt2x00/rt2x00mac.c   |    9 +++-
 drivers/net/wireless/rt2x00/rt2x00pci.c   |   99 +++++++++++++++++++---------
 drivers/net/wireless/rt2x00/rt2x00pci.h   |    8 +-
 drivers/net/wireless/rt2x00/rt2x00queue.c |   36 ++++++-----
 drivers/net/wireless/rt2x00/rt2x00usb.c   |   37 ++++++++---
 drivers/net/wireless/rt2x00/rt61pci.c     |    8 +--
 drivers/net/wireless/rt2x00/rt61pci.h     |    2 +-
 drivers/net/wireless/rt2x00/rt73usb.c     |    8 +--
 15 files changed, 231 insertions(+), 134 deletions(-)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is the 2.1.2 release of rt2x00. Several important bugfixes like a
partial return of TX/RX activity in the PCI drivers.

Note that _none_ of the drivers (PCI or USB) are in a good shape since the
2.1.0 release. With partial RX/TX activity we are at least now on a similar
behavior as the 2.0.14 version inside kernel 2.6.25.

Speaking of the 2.6.25 kernel, it seems that rt2x00 is not in an all too good
shape in there. If more reports about broken TX/RX come in I will consider
reverting a lot of patches to make rt2x00 look a lot like the version in 2.6.24.
That version wasn't good either, but at least people can't complain about
regressions. ;)

Also note that the git pull request below also contains the patches from
previous pull request. But I noticed that you hadn't pulled in the 2.1.1 release yet.
I won't resent those patches to the list, since there aren't any changes in them
since last week. ;)

Ivo

---
The following changes since commit 2b78397a79d3daa2ba6c633526a7e3b455f9fc73:
  Stefano Brivio (1):
        b43legacy: Add driver load messages

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Adam Baker (1):
      rt2x00: correct address calc for queue private data

Gertjan van Wingerde (1):
      Fix hw mode registration with mac80211.

Ivo van Doorn (23):
      rt2x00: Fix invalid DMA free
      rt2x00: Make rt2x00 less verbose
      rt2x00: Remove MGMT ring initialization
      rt2x00: Select CONFIG_NEW_LEDS
      rt2x00: make csr_cache and csr_addr an union
      rt2x00: Fix scheduling while atomic errors in usb drivers
      rt2x00: Add queue statistics to debugfs
      rt2x00: Fix typo in debug statement
      rt2x00: Fix skbdesc->data_len initialization
      rt2x00: Fix queue->qid initialization
      rt2x00: Cleanup Makefile
      rt2x00: Kill guardian urb during disable_radio
      rt2x00: Release rt2x00 2.1.1
      rt2x00: Send frames out with configured TX power
      rt2x00: Don't report driver generated frames to tx_status()
      rt2x00: Fix Descriptor DMA initialization
      rt2x00: Filter ACK_CTS based on FIF_CONTROL
      rt2x00: Remove reset_tsf()
      rt2x00: Rename dscape -> mac80211
      rt2x00: Cleanup mode registration
      rt2x00: Remove async vendor request calls from rt2x00usb
      rt2x00: Fix MAC address defines in rt61pci
      rt2x00: Release rt2x00 2.1.2

 drivers/net/wireless/rt2x00/Kconfig       |    3 +-
 drivers/net/wireless/rt2x00/Makefile      |   41 ++++-------
 drivers/net/wireless/rt2x00/rt2400pci.c   |   39 ++++------
 drivers/net/wireless/rt2x00/rt2400pci.h   |    6 +-
 drivers/net/wireless/rt2x00/rt2500pci.c   |   38 ++++------
 drivers/net/wireless/rt2x00/rt2500pci.h   |    4 +-
 drivers/net/wireless/rt2x00/rt2500usb.c   |   23 ++++---
 drivers/net/wireless/rt2x00/rt2500usb.h   |    4 +-
 drivers/net/wireless/rt2x00/rt2x00.h      |   50 ++++++++-----
 drivers/net/wireless/rt2x00/rt2x00debug.c |   90 ++++++++++++++++++++----
 drivers/net/wireless/rt2x00/rt2x00dev.c   |  100 +++++++++++++++------------
 drivers/net/wireless/rt2x00/rt2x00lib.h   |    5 +-
 drivers/net/wireless/rt2x00/rt2x00mac.c   |   24 ++++++-
 drivers/net/wireless/rt2x00/rt2x00pci.c   |  108 +++++++++++++++++++---------
 drivers/net/wireless/rt2x00/rt2x00pci.h   |   14 ++--
 drivers/net/wireless/rt2x00/rt2x00queue.c |   36 +++++----
 drivers/net/wireless/rt2x00/rt2x00queue.h |   12 +++-
 drivers/net/wireless/rt2x00/rt2x00usb.c   |   90 +++++++-----------------
 drivers/net/wireless/rt2x00/rt2x00usb.h   |   18 -----
 drivers/net/wireless/rt2x00/rt61pci.c     |   54 ++++++--------
 drivers/net/wireless/rt2x00/rt61pci.h     |   12 ++--
 drivers/net/wireless/rt2x00/rt73usb.c     |   56 +++++++--------
 drivers/net/wireless/rt2x00/rt73usb.h     |    4 +-
 23 files changed, 453 insertions(+), 378 deletions(-)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is the 2.1.3 release of rt2x00.
Most bugfixes concentrate on the link tuner issues reported for
the rt2x00 2.0.14 version inside kernel 2.6.25.
One additional fix for rt61pci is present where the recent
"mode->band" changes in mac80211 contained a bug for rt61pci.

Ivo

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

This is the latest version of rt2x00: 2.1.4

All drivers are now showing excellent progress, rt2400pci, rt2500pci, rt61pci and rt73usb
seem to be working as expected now. And only rt2500usb is spoiling things by having
only a working RX but no TX.

After this patch series, it is highly likely you can close a lot of rt2x00 related bugs
in the Fedora bugzilla. :)
Ivo

---
The following changes since commit 4f739cf30891f277a6353d61275489528fab64e3:
  Pavel Roskin (1):
        at76_usb: make the driver depend on MAC80211

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Adam Baker (2):
      rt2x00: never disable multicast because it disables broadcast too
      rt2x00:correct rx packet length for USB devices

Ivo van Doorn (18):
      rt2x00: Align RX descriptor to 4 bytes
      rt2x00: Don't use uninitialized desc_len
      rt2x00: Use skbdesc fields for descriptor initialization
      rt2x00: Add new D-Link USB ID
      rt2x00: Only disable beaconing just before beacon update
      rt2x00: Upgrade queue->lock to use irqsave
      rt2x00: Move firmware checksumming to driver
      rt2x00: Start bugging when rt2x00lib doesn't filter SW diversity
      rt2x00: Check IEEE80211_TXCTL_SEND_AFTER_DTIM flag
      rt2x00: Rename config_preamble() to config_erp()
      rt2x00: Add suspend/resume handlers to rt2x00rfkill
      rt2x00: Make rt2x00leds_register return void
      rt2x00: Always enable TSF ticking
      rt2x00: Fix basic rate initialization
      rt2x00: Fix compile error when rfkill is disabled
      rt2x00: Fix RX DMA ring initialization
      rt2x00: Fix rt2400pci signal
      rt2x00: Release rt2x00 2.1.4

Luis Correia (1):
      rt2x00: Fix trivial log message

Mattias Nissler (3):
      rt2x00: Initialize TX control field in data entries
      rt2x00: Use the correct size when copying the control info in txdone
      rt2x00: Don't use unitialized rxdesc->size

 drivers/net/wireless/rt2x00/Kconfig          |    4 +-
 drivers/net/wireless/rt2x00/rt2400pci.c      |   67 +++++++------
 drivers/net/wireless/rt2x00/rt2400pci.h      |    6 +-
 drivers/net/wireless/rt2x00/rt2500pci.c      |   71 ++++++++------
 drivers/net/wireless/rt2x00/rt2500usb.c      |   97 ++++++++++---------
 drivers/net/wireless/rt2x00/rt2x00.h         |   31 ++++--
 drivers/net/wireless/rt2x00/rt2x00config.c   |   62 +++++++-----
 drivers/net/wireless/rt2x00/rt2x00debug.c    |    5 +-
 drivers/net/wireless/rt2x00/rt2x00dev.c      |  108 +++++++++------------
 drivers/net/wireless/rt2x00/rt2x00firmware.c |   34 +-------
 drivers/net/wireless/rt2x00/rt2x00leds.c     |    7 +-
 drivers/net/wireless/rt2x00/rt2x00lib.h      |   45 ++++-----
 drivers/net/wireless/rt2x00/rt2x00mac.c      |   22 +++--
 drivers/net/wireless/rt2x00/rt2x00pci.c      |    1 +
 drivers/net/wireless/rt2x00/rt2x00queue.c    |   17 ++-
 drivers/net/wireless/rt2x00/rt2x00queue.h    |    3 +
 drivers/net/wireless/rt2x00/rt2x00rfkill.c   |  116 +++++++++++++++--------
 drivers/net/wireless/rt2x00/rt2x00usb.c      |   19 ++++-
 drivers/net/wireless/rt2x00/rt61pci.c        |  104 ++++++++++++--------
 drivers/net/wireless/rt2x00/rt73usb.c        |  131 +++++++++++++++-----------
 20 files changed, 524 insertions(+), 426 deletions(-)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Finally a new official rt2x00 release,
off course I have send a lot of patches over the past few weeks
with several bugfixes, but now I am bumping the versions to 2.1.5.

Please consider this patch series for the 2.6.26 kernel,
they are all either bugfixes or minor cleanups.
with the exception of "[PATCH 4/9] rt2x00: Use rt2x00 queue numbering"
which besides a cleanup will also help with the pending mac80211
queue reorganization to QDisc.

Ivo

PS. Don't be alarmed over the "The following changes since commit"
line below which indicates "mac80211: Add IEEE80211_KEY_FLAG_PAIRWISE"
is used as basis. That patch is _not_ present in the rt2x00.git upstream branch
and none of the following patches depend on that patch.

---
The following changes since commit c8b29c460a389a8561189ad2a77fcb697ef35df9:
  Ivo van Doorn (1):
        mac80211: Add IEEE80211_KEY_FLAG_PAIRWISE

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Ivo van Doorn (9):
      rt2x00: Support hardware RTS and CTS-to-self frames
      rt2x00: Remove DRIVER_SUPPORT_MIXED_INTERFACES
      rt2x00: Don't enable short preamble for 1MBs
      rt2x00: Use rt2x00 queue numbering
      rt2x00: Fix quality/activity led handling
      rt2x00: Clarify supported chipsets in Kconfig
      rt2x00: Add helper macros
      rt2x00: Fix kernel-doc
      rt2x00: Release rt2x00 2.1.5

 drivers/net/wireless/rt2x00/Kconfig       |   55 +++++++++++++++++------------
 drivers/net/wireless/rt2x00/rt2400pci.c   |   36 +++++++------------
 drivers/net/wireless/rt2x00/rt2500pci.c   |   39 +++++++-------------
 drivers/net/wireless/rt2x00/rt2500usb.c   |   22 ++++-------
 drivers/net/wireless/rt2x00/rt2x00.h      |   18 ++++-----
 drivers/net/wireless/rt2x00/rt2x00dev.c   |    5 ++-
 drivers/net/wireless/rt2x00/rt2x00leds.c  |   15 ++++++++
 drivers/net/wireless/rt2x00/rt2x00lib.h   |    6 +++
 drivers/net/wireless/rt2x00/rt2x00mac.c   |   31 +++++++++-------
 drivers/net/wireless/rt2x00/rt2x00pci.c   |    2 +-
 drivers/net/wireless/rt2x00/rt2x00pci.h   |    6 ++-
 drivers/net/wireless/rt2x00/rt2x00queue.c |    6 ++--
 drivers/net/wireless/rt2x00/rt2x00queue.h |   40 +++++++++++++-------
 drivers/net/wireless/rt2x00/rt2x00usb.c   |    4 +-
 drivers/net/wireless/rt2x00/rt2x00usb.h   |   21 +++++++++--
 drivers/net/wireless/rt2x00/rt61pci.c     |   29 +++++----------
 drivers/net/wireless/rt2x00/rt73usb.c     |   35 +++++++-----------
 17 files changed, 191 insertions(+), 179 deletions(-)

Re: Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

> Finally a new official rt2x00 release,
> off course I have send a lot of patches over the past few weeks
> with several bugfixes, but now I am bumping the versions to 2.1.5.
> 
> Please consider this patch series for the 2.6.26 kernel,

Was this patch series in time for the 2.6.26 merge window?

If not, please consider merging at least the following patches since
they are real bugfixes:

>       rt2x00: Don't enable short preamble for 1MBs
>       rt2x00: Fix quality/activity led handling
>       rt2x00: Clarify supported chipsets in Kconfig

The others are code cleanups which are "nice to have", but could otherwise
wait for 2.6.27.

>       rt2x00: Support hardware RTS and CTS-to-self frames
>       rt2x00: Remove DRIVER_SUPPORT_MIXED_INTERFACES
>       rt2x00: Use rt2x00 queue numbering
>       rt2x00: Add helper macros
>       rt2x00: Fix kernel-doc
>       rt2x00: Release rt2x00 2.1.5

Thanks,

Ivo

Re: Please pull 'upstream' branch of rt2x00

[Scott White]

>Was this patch series in time for the 2.6.26 merge window?
>
>If not, please consider merging at least the following patches since
>they are real bugfixes:
>
>>       rt2x00: Don't enable short preamble for 1MBs
>>       rt2x00: Fix quality/activity led handling
>>       rt2x00: Clarify supported chipsets in Kconfig
>
>The others are code cleanups which are "nice to have", but could otherwise
>wait for 2.6.27.

The merge window is still open at this time.  I haven't seen a rc1 yet.  Anyway I saw that only the 3 bugfixes are currently in the queue.  As the owner of several (10 by the university and 2 personal) rt73 usb wireless cards, I would really like it if the latest version 2.1.5 made into 2.6.26.  As someone who has used 2.6.24 and finished compiling 2.6.25 two days ago I find that the driver in both kernels is not good.  Not good means I get a wireless signal and I get data transfers, but the speed fluctuates and have other issues.  However with each release, the problems I have are slowing decreasing.  I have been waiting patiently for 2.6.25-rc1 to have 2.1.5 since 2.1.5 was announced.  I really think all of 2.1.5 should get in 2.6.25-rc1.

Thanks,
_________________________________________________________________
Windows Live SkyDrive lets you share files with faraway friends.
http://www.windowslive.com/skydrive/overview.html?ocid=TXT_TAGLM_WL_Refresh_skydrive_052008

Re: Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

On Friday 02 May 2008, Scott White wrote:
> 
> >Was this patch series in time for the 2.6.26 merge window?
> >
> >If not, please consider merging at least the following patches since
> >they are real bugfixes:
> >
> >>       rt2x00: Don't enable short preamble for 1MBs
> >>       rt2x00: Fix quality/activity led handling
> >>       rt2x00: Clarify supported chipsets in Kconfig
> >
> >The others are code cleanups which are "nice to have", but could otherwise
> >wait for 2.6.27.
> 
> The merge window is still open at this time.  I haven't seen a rc1 yet.  Anyway I saw that only the 3 bugfixes are currently in the queue.  As the owner of several (10 by the university and 2 personal) rt73 usb wireless cards, I would really like it if the latest version 2.1.5 made into 2.6.26.  As someone who has used 2.6.24 and finished compiling 2.6.25 two days ago I find that the driver in both kernels is not good.  Not good means I get a wireless signal and I get data transfers, but the speed fluctuates and have other issues.  However with each release, the problems I have are slowing decreasing.  I have been waiting patiently for 2.6.25-rc1 to have 2.1.5 since 2.1.5 was announced.  I really think all of 2.1.5 should get in 2.6.25-rc1.

Have you tried forcing the rate to 54Mbit instead of letting the rate selection algorithm doing its work?
It seems to have helped with several other users.

Ivo

Re: Please pull 'upstream' branch of rt2x00

[Mattias Nissler]

On Fri, 2008-05-02 at 23:25 +0200, Ivo van Doorn wrote:
> On Friday 02 May 2008, Scott White wrote:
> > 
> > >Was this patch series in time for the 2.6.26 merge window?
> > >
> > >If not, please consider merging at least the following patches since
> > >they are real bugfixes:
> > >
> > >>       rt2x00: Don't enable short preamble for 1MBs
> > >>       rt2x00: Fix quality/activity led handling
> > >>       rt2x00: Clarify supported chipsets in Kconfig
> > >
> > >The others are code cleanups which are "nice to have", but could otherwise
> > >wait for 2.6.27.
> > 
> > The merge window is still open at this time.  I haven't seen a rc1 yet.  Anyway I saw that only the 3 bugfixes are currently in the queue.  As the owner of several (10 by the university and 2 personal) rt73 usb wireless cards, I would really like it if the latest version 2.1.5 made into 2.6.26.  As someone who has used 2.6.24 and finished compiling 2.6.25 two days ago I find that the driver in both kernels is not good.  Not good means I get a wireless signal and I get data transfers, but the speed fluctuates and have other issues.  However with each release, the problems I have are slowing decreasing.  I have been waiting patiently for 2.6.25-rc1 to have 2.1.5 since 2.1.5 was announced.  I really think all of 2.1.5 should get in 2.6.25-rc1.
> 
> Have you tried forcing the rate to 54Mbit instead of letting the rate selection algorithm doing its work?
> It seems to have helped with several other users.

For rt73? IIRC the rate selection algo does not work at all for that
device, because we cannot report failed frames. Or have you done
anything about that I might have missed, Ivo? If not, the rate is
probably fixed at 54Mbit anyway.

Mattias

Re: Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

On Saturday 03 May 2008, Mattias Nissler wrote:
> On Fri, 2008-05-02 at 23:25 +0200, Ivo van Doorn wrote:
> > On Friday 02 May 2008, Scott White wrote:
> > > 
> > > >Was this patch series in time for the 2.6.26 merge window?
> > > >
> > > >If not, please consider merging at least the following patches since
> > > >they are real bugfixes:
> > > >
> > > >>       rt2x00: Don't enable short preamble for 1MBs
> > > >>       rt2x00: Fix quality/activity led handling
> > > >>       rt2x00: Clarify supported chipsets in Kconfig
> > > >
> > > >The others are code cleanups which are "nice to have", but could otherwise
> > > >wait for 2.6.27.
> > > 
> > > The merge window is still open at this time.  I haven't seen a rc1 yet.  Anyway I saw that only the 3 bugfixes are currently in the queue.  As the owner of several (10 by the university and 2 personal) rt73 usb wireless cards, I would really like it if the latest version 2.1.5 made into 2.6.26.  As someone who has used 2.6.24 and finished compiling 2.6.25 two days ago I find that the driver in both kernels is not good.  Not good means I get a wireless signal and I get data transfers, but the speed fluctuates and have other issues.  However with each release, the problems I have are slowing decreasing.  I have been waiting patiently for 2.6.25-rc1 to have 2.1.5 since 2.1.5 was announced.  I really think all of 2.1.5 should get in 2.6.25-rc1.
> > 
> > Have you tried forcing the rate to 54Mbit instead of letting the rate selection algorithm doing its work?
> > It seems to have helped with several other users.
> 
> For rt73? IIRC the rate selection algo does not work at all for that
> device, because we cannot report failed frames. Or have you done
> anything about that I might have missed, Ivo? If not, the rate is
> probably fixed at 54Mbit anyway.

Well I didn't do anything new, but this line will report rt2x00lib that the
frame was succesfully send or failed to send:
	txdesc.status = !urb->status ? TX_SUCCESS : TX_FAIL_RETRY;
What is missing is the retry count, since that is something that
the USB drivers cannot report. (Unless I grab the max retry count
as configured by mac80211 as the number of retries on failure)

Ivo

Re: Please pull 'upstream' branch of rt2x00

[Mattias Nissler]

On Sat, 2008-05-03 at 11:58 +0200, Ivo van Doorn wrote:
> On Saturday 03 May 2008, Mattias Nissler wrote:
> > On Fri, 2008-05-02 at 23:25 +0200, Ivo van Doorn wrote:
> > > On Friday 02 May 2008, Scott White wrote:
> > > > 
> > > > >Was this patch series in time for the 2.6.26 merge window?
> > > > >
> > > > >If not, please consider merging at least the following patches since
> > > > >they are real bugfixes:
> > > > >
> > > > >>       rt2x00: Don't enable short preamble for 1MBs
> > > > >>       rt2x00: Fix quality/activity led handling
> > > > >>       rt2x00: Clarify supported chipsets in Kconfig
> > > > >
> > > > >The others are code cleanups which are "nice to have", but could otherwise
> > > > >wait for 2.6.27.
> > > > 
> > > > The merge window is still open at this time.  I haven't seen a rc1 yet.  Anyway I saw that only the 3 bugfixes are currently in the queue.  As the owner of several (10 by the university and 2 personal) rt73 usb wireless cards, I would really like it if the latest version 2.1.5 made into 2.6.26.  As someone who has used 2.6.24 and finished compiling 2.6.25 two days ago I find that the driver in both kernels is not good.  Not good means I get a wireless signal and I get data transfers, but the speed fluctuates and have other issues.  However with each release, the problems I have are slowing decreasing.  I have been waiting patiently for 2.6.25-rc1 to have 2.1.5 since 2.1.5 was announced.  I really think all of 2.1.5 should get in 2.6.25-rc1.
> > > 
> > > Have you tried forcing the rate to 54Mbit instead of letting the rate selection algorithm doing its work?
> > > It seems to have helped with several other users.
> > 
> > For rt73? IIRC the rate selection algo does not work at all for that
> > device, because we cannot report failed frames. Or have you done
> > anything about that I might have missed, Ivo? If not, the rate is
> > probably fixed at 54Mbit anyway.
> 
> Well I didn't do anything new, but this line will report rt2x00lib that the
> frame was succesfully send or failed to send:
> 	txdesc.status = !urb->status ? TX_SUCCESS : TX_FAIL_RETRY;
> What is missing is the retry count, since that is something that
> the USB drivers cannot report. (Unless I grab the max retry count
> as configured by mac80211 as the number of retries on failure)

Well, I have just put my rt73 into a metal box. Many frames do fail,
only very few get through pinging my AP. The rate control still keeps
the rate at 54Mbit/s :-) So it seems neither excessive_retries nor the
retry_count in the tx_status struct is set at all.

Mattias

Re: Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

> > > For rt73? IIRC the rate selection algo does not work at all for that
> > > device, because we cannot report failed frames. Or have you done
> > > anything about that I might have missed, Ivo? If not, the rate is
> > > probably fixed at 54Mbit anyway.
> > 
> > Well I didn't do anything new, but this line will report rt2x00lib that the
> > frame was succesfully send or failed to send:
> > 	txdesc.status = !urb->status ? TX_SUCCESS : TX_FAIL_RETRY;
> > What is missing is the retry count, since that is something that
> > the USB drivers cannot report. (Unless I grab the max retry count
> > as configured by mac80211 as the number of retries on failure)
> 
> Well, I have just put my rt73 into a metal box. Many frames do fail,
> only very few get through pinging my AP. The rate control still keeps
> the rate at 54Mbit/s :-) So it seems neither excessive_retries nor the
> retry_count in the tx_status struct is set at all.

Hmm, perhaps we need some way the driver can inform the rate selection
module about statistics. I mean the hardware does measure the number
of failed TX frames, and the number of retries, but it doesn't set them
in the descriptor but in the hardware.

Ivo

Re: Please pull 'upstream' branch of rt2x00

[Johannes Berg]

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


> Hmm, perhaps we need some way the driver can inform the rate selection
> module about statistics. I mean the hardware does measure the number
> of failed TX frames, and the number of retries, but it doesn't set them
> in the descriptor but in the hardware.

Yes we should have this.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: Please pull 'upstream' branch of rt2x00

[Mattias Nissler]

On Sat, 2008-05-03 at 17:27 +0200, Johannes Berg wrote:
> > Hmm, perhaps we need some way the driver can inform the rate selection
> > module about statistics. I mean the hardware does measure the number
> > of failed TX frames, and the number of retries, but it doesn't set them
> > in the descriptor but in the hardware.
> 
> Yes we should have this.

New rate control algorithm probably. Or even better: Split what is
currently the rate control algorithm into an link quality estimation
part (failed frames percentage and such) and the actual rate control
that interprets that value and acts accordingly.

Mattias

Re: Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

On Saturday 03 May 2008, Mattias Nissler wrote:
> On Sat, 2008-05-03 at 17:27 +0200, Johannes Berg wrote:
> > > Hmm, perhaps we need some way the driver can inform the rate selection
> > > module about statistics. I mean the hardware does measure the number
> > > of failed TX frames, and the number of retries, but it doesn't set them
> > > in the descriptor but in the hardware.
> > 
> > Yes we should have this.
> 
> New rate control algorithm probably. Or even better: Split what is
> currently the rate control algorithm into an link quality estimation
> part (failed frames percentage and such) and the actual rate control
> that interprets that value and acts accordingly.

Hmm, splitting that up would be nice, especially when the driver
will have access to those failed frame percentages directly.
rt2x00 currently keeps track of these statistics to perform link tuning,
I wouldn't be surprised if other drivers also keep similar statistics for
the same reason.

Ivo

RE: Please pull 'upstream' branch of rt2x00

[Scott White]

> To: nwi_sub@hotmail.com
> Subject: Re: Please pull 'upstream' branch of rt2x00
> Date: Fri, 2 May 2008 23:25:38 +0200
> CC: linux-wireless@vger.kernel.org
> From: ivdoorn@gmail.com
>
> On Friday 02 May 2008, Scott White wrote:
>>
>>>Was this patch series in time for the 2.6.26 merge window?
>>>
>>>If not, please consider merging at least the following patches since
>>>they are real bugfixes:
>>>
>>>> rt2x00: Don't enable short preamble for 1MBs
>>>> rt2x00: Fix quality/activity led handling
>>>> rt2x00: Clarify supported chipsets in Kconfig
>>>
>>>The others are code cleanups which are "nice to have", but could otherwise
>>>wait for 2.6.27.
>>
>> The merge window is still open at this time. I haven't seen a rc1 yet. Anyway I saw that only the 3 bugfixes are currently in the queue. As the owner of several (10 by the university and 2 personal) rt73 usb wireless cards, I would really like it if the latest version 2.1.5 made into 2.6.26. As someone who has used 2.6.24 and finished compiling 2.6.25 two days ago I find that the driver in both kernels is not good. Not good means I get a wireless signal and I get data transfers, but the speed fluctuates and have other issues. However with each release, the problems I have are slowing decreasing. I have been waiting patiently for 2.6.25-rc1 to have 2.1.5 since 2.1.5 was announced. I really think all of 2.1.5 should get in 2.6.25-rc1.
>
> Have you tried forcing the rate to 54Mbit instead of letting the rate selection algorithm doing its work?
> It seems to have helped with several other users.
>
> Ivo

No I haven't tried that.  However I have 54Mbit (g) at home, but only 11Mbit (b only) at work.  I guess I would have to change the rate when I change locations.

Thanks,

_________________________________________________________________
Make Windows Vista more reliable and secure with Windows Vista Service Pack 1.
http://www.windowsvista.com/SP1?WT.mc_id=hotmailvistasp1banner

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here are 3 patches for rt2x00, they are all intended for 2.6.26 since
they fix serious bugs. Patch 1 should prevent problems as reported by
Johannes Berg regarding skb->truesize by removing the only pskb_expand_head()
call in rt2x00 (and use a already existing buffer instead).

Patches 2 and 3 fix problems when DMA allocation fails, that usually doesn't happen,
hence the reason these problems have gone unnoticed for so long. :S

Ivo

---
The following changes since commit 0bacadffc86bcba2fdf2b989afc286a8184664a0:
  Ivo van Doorn (1):
        rt2x00: Fix quality/activity led handling

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Gertjan van Wingerde (1):
      rt2x00: Clean up error handling of PCI queue DMA allocation.

Ivo van Doorn (2):
      rt2x00: Don't use pskb_expand_head()
      rt2x00: Fix broken recover-on-error path

 drivers/net/wireless/rt2x00/rt2x00dev.c |   11 ++++-------
 drivers/net/wireless/rt2x00/rt2x00pci.c |    5 +++--
 drivers/net/wireless/rt2x00/rt61pci.c   |   31 +++++++++++--------------------
 3 files changed, 18 insertions(+), 29 deletions(-)

Re: Please pull 'upstream' branch of rt2x00

[John W. Linville]

On Fri, May 02, 2008 at 04:04:52PM -0500, Scott White wrote:
> 
> >Was this patch series in time for the 2.6.26 merge window?
> >
> >If not, please consider merging at least the following patches since
> >they are real bugfixes:
> >
> >>       rt2x00: Don't enable short preamble for 1MBs
> >>       rt2x00: Fix quality/activity led handling
> >>       rt2x00: Clarify supported chipsets in Kconfig
> >
> >The others are code cleanups which are "nice to have", but could otherwise
> >wait for 2.6.27.
> 
> The merge window is still open at this time.  I haven't seen
> a rc1 yet.  Anyway I saw that only the 3 bugfixes are currently
> in the queue.  As the owner of several (10 by the university and
> 2 personal) rt73 usb wireless cards, I would really like it if the
> latest version 2.1.5 made into 2.6.26.  As someone who has used 2.6.24
> and finished compiling 2.6.25 two days ago I find that the driver in
> both kernels is not good.  Not good means I get a wireless signal and
> I get data transfers, but the speed fluctuates and have other issues.
> However with each release, the problems I have are slowing decreasing.
> I have been waiting patiently for 2.6.25-rc1 to have 2.1.5 since 2.1.5
> was announced.  I really think all of 2.1.5 should get in 2.6.25-rc1.

I'm sorry, but this isn't how the merge window is used.  The merge
window is for merging code that is _already_ pending when the
window opens.  No one should wait for the merge window to open before
sending code to the upstream maintainers.  (I'm not suggesting that
Ivo delayed on purpose, I'm just stating the policy.)

Anything that fixes an actual bug can still go to 2.6.26 over the
next several weeks.  But code that is simply new development will
have to wait for 2.6.27's merge window before it gets to Linus.

Thanks,

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

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is a new rt2x00 release.
Please note that some patches have been send individually to linux-wireless before,
(including the 2 mac80211 patches) but for completeness I have added them to
this pull request.

This will bump rt2x00 to version 2.1.6, most patches are only intended to make
room for future patches like the mac80211 patch series from Johannes, HW crypto
and pci drivers without a preallocated big chunk of DMA.

Ivo

---
The following changes since commit d30d1674356e223c9f2c164ac9d0be35af8ee4e0:
  Johannes Berg (1):
        mac80211: fix wme code

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Gertjan van Wingerde (3):
      rt2x00: Clean up error handling of PCI queue DMA allocation.
      rt2x00: Fix queue related oops in case of deselected mac80211 multi-queue feature.
      rt2x00: Only initialize the minimum needed fields of PCI TX descriptors.

Ivo van Doorn (13):
      rt2x00: Don't use pskb_expand_head()
      rt2x00: Fix broken recover-on-error path
      mac80211: Don't encrypt beacons
      mac80211: Add RTNL version of ieee80211_iterate_active_interfaces
      rt2x00: trim skb_frame_desc to 32 bytes
      rt2x00: Fix TX status reporting
      rt2x00: Remove ieee80211_tx_control argument from write_tx_desc()
      rt2x00: Preserve descriptor information after memmove()
      rt2x00: Split rt2x00lib_write_tx_desc()
      rt2x00: Remove redundant flags/dev_flags initializations
      rt2x00: Merge RX and TX entry private data
      rt2x00: Remove extra +
      rt2x00: Release rt2x00 2.1.6

 drivers/net/wireless/rt2x00/rt2400pci.c   |  126 +++++++++-------
 drivers/net/wireless/rt2x00/rt2400pci.h   |    5 +
 drivers/net/wireless/rt2x00/rt2500pci.c   |  114 ++++++++------
 drivers/net/wireless/rt2x00/rt2500pci.h   |    5 +
 drivers/net/wireless/rt2x00/rt2500usb.c   |   78 +++++-----
 drivers/net/wireless/rt2x00/rt2500usb.h   |    5 +
 drivers/net/wireless/rt2x00/rt2x00.h      |   48 +++++--
 drivers/net/wireless/rt2x00/rt2x00debug.c |    4 +-
 drivers/net/wireless/rt2x00/rt2x00dev.c   |  190 +++---------------------
 drivers/net/wireless/rt2x00/rt2x00lib.h   |    6 +-
 drivers/net/wireless/rt2x00/rt2x00mac.c   |    2 +-
 drivers/net/wireless/rt2x00/rt2x00pci.c   |  105 +++++--------
 drivers/net/wireless/rt2x00/rt2x00pci.h   |   22 +---
 drivers/net/wireless/rt2x00/rt2x00queue.c |  165 ++++++++++++++++++++-
 drivers/net/wireless/rt2x00/rt2x00queue.h |   45 ++++--
 drivers/net/wireless/rt2x00/rt2x00reg.h   |   11 --
 drivers/net/wireless/rt2x00/rt2x00usb.c   |  228 +++++++++++++++-------------
 drivers/net/wireless/rt2x00/rt2x00usb.h   |   17 +--
 drivers/net/wireless/rt2x00/rt61pci.c     |  146 ++++++++++---------
 drivers/net/wireless/rt2x00/rt61pci.h     |    5 +
 drivers/net/wireless/rt2x00/rt73usb.c     |   53 ++++----
 drivers/net/wireless/rt2x00/rt73usb.h     |    5 +
 include/net/mac80211.h                    |   25 +++-
 net/mac80211/tx.c                         |    1 +
 net/mac80211/util.c                       |   37 +++++-
 25 files changed, 794 insertions(+), 654 deletions(-)

Re: Please pull 'upstream' branch of rt2x00

[drago01]

On Sat, May 10, 2008 at 1:37 PM, Ivo van Doorn <ivdoorn@gmail.com> wrote:
> Hi John,
>
> Here is a new rt2x00 release.
> Please note that some patches have been send individually to linux-wireless before,
> (including the 2 mac80211 patches) but for completeness I have added them to
> this pull request.
>
> This will bump rt2x00 to version 2.1.6, most patches are only intended to make
> room for future patches like the mac80211 patch series from Johannes, HW crypto
> and pci drivers without a preallocated big chunk of DMA.
>
> Ivo

whats the current status of rt2860 support?

Re: Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

On Saturday 10 May 2008, drago01 wrote:
> On Sat, May 10, 2008 at 1:37 PM, Ivo van Doorn <ivdoorn@gmail.com> wrote:
> > Hi John,
> >
> > Here is a new rt2x00 release.
> > Please note that some patches have been send individually to linux-wireless before,
> > (including the 2 mac80211 patches) but for completeness I have added them to
> > this pull request.
> >
> > This will bump rt2x00 to version 2.1.6, most patches are only intended to make
> > room for future patches like the mac80211 patch series from Johannes, HW crypto
> > and pci drivers without a preallocated big chunk of DMA.
> >
> > Ivo
> 
> whats the current status of rt2860 support?

Under development.

Ivo

Re: Please pull 'upstream' branch of rt2x00

[drago01]

On Sat, May 10, 2008 at 3:06 PM, Ivo van Doorn <ivdoorn@gmail.com> wrote:
> On Saturday 10 May 2008, drago01 wrote:
>> On Sat, May 10, 2008 at 1:37 PM, Ivo van Doorn <ivdoorn@gmail.com> wrote:
>> > Hi John,
>> >
>> > Here is a new rt2x00 release.
>> > Please note that some patches have been send individually to linux-wireless before,
>> > (including the 2 mac80211 patches) but for completeness I have added them to
>> > this pull request.
>> >
>> > This will bump rt2x00 to version 2.1.6, most patches are only intended to make
>> > room for future patches like the mac80211 patch series from Johannes, HW crypto
>> > and pci drivers without a preallocated big chunk of DMA.
>> >
>> > Ivo
>>
>> whats the current status of rt2860 support?
>
> Under development.

well ok ;)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is the official pull request for the latest rt2x00.git.
This contains all patches which I had send last tuesday
plus some additional patches intended for 2.6.27.

This series is mostly intended to get the fragmentation
done right. Up until now the drivers never behaved that
nicely with fragmentation or RTS/CTS-to-sellf which was
mostly due because each individual frame forced the
queue to be kicked immediately without waiting for the
other fragments.

It also contains some front work by Gertjan for reducing
DMA requirements in rt2x00 by making use of pci_map_single
on skbuffers instead of preallocating a chunk of DMA.

Ivo

P.S. I won't resend the patches I had send last tuesday
since nothing has changed with them. So only the 10
new patches will be send seperately. I am not sure
if that feature will be ready/stable for 2.6.27 but this
preperational work is harmless for normal operations
to it is better if that is already in.

---
The following changes since commit ef28eab0c928fe8277d7c3dca234c29f734d7f2e:
  Dan Williams (1):
        ipw2200: queue direct scans

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Gertjan van Wingerde (5):
      rt2x00: Restrict DMA to 32-bit addresses.
      rt2x00: Cleanup struct skb_frame_desc.
      rt2x00: Centralize RX packet alignment handling in rt2x00lib.
      rt2x00: Fix double usage of skb->cb in USB RX path.
      rt2x00: Rework alignment check.

Ivo van Doorn (15):
      rt2x00: Calculate register offset during compile time
      rt2x00: Cleanup/optimize set_state() function callback function
      rt2x00: Move led initialization into function
      rt2x00: Remove CTS/RTS check in tx()
      rt2x00: Removed unused descriptor read in txdone
      rt2x00: Don't kill guardian_urb when it wasn't created
      rt2x00: Make rt2x00_set/get_field macros
      rt2x00: Release rt2x00 2.1.7
      rt2x00: Fix queue initialization
      rt2x00: Implement rt2x00usb_kick_tx_queue()
      rt2x00: Move generic TX frame writing code into rt2x00queue
      rt2x00: Don't kick TX queue after each frame
      rt2x00: Use __builtin_choose_expr() instead of ?:
      rt2x00: Clear IEEE80211_TX_CTL_USE_RTS_CTS flag for RTS frame
      rt2x00: Remove unused defines

 drivers/net/wireless/rt2x00/rt2400pci.c   |   95 ++++++++---------
 drivers/net/wireless/rt2x00/rt2400pci.h   |    2 -
 drivers/net/wireless/rt2x00/rt2500pci.c   |   91 +++++++--------
 drivers/net/wireless/rt2x00/rt2500pci.h   |    2 -
 drivers/net/wireless/rt2x00/rt2500usb.c   |   98 ++++++++--------
 drivers/net/wireless/rt2x00/rt2500usb.h   |    2 -
 drivers/net/wireless/rt2x00/rt2x00.h      |   13 ++-
 drivers/net/wireless/rt2x00/rt2x00debug.c |    6 +-
 drivers/net/wireless/rt2x00/rt2x00dev.c   |   21 ++++
 drivers/net/wireless/rt2x00/rt2x00lib.h   |    1 +
 drivers/net/wireless/rt2x00/rt2x00mac.c   |   30 ++----
 drivers/net/wireless/rt2x00/rt2x00pci.c   |   75 ++++---------
 drivers/net/wireless/rt2x00/rt2x00pci.h   |   11 +-
 drivers/net/wireless/rt2x00/rt2x00queue.c |  111 ++++++++++++++++---
 drivers/net/wireless/rt2x00/rt2x00queue.h |   27 +++--
 drivers/net/wireless/rt2x00/rt2x00reg.h   |  134 +++++++++++++---------
 drivers/net/wireless/rt2x00/rt2x00usb.c   |  170 +++++++++++------------------
 drivers/net/wireless/rt2x00/rt2x00usb.h   |   22 +++-
 drivers/net/wireless/rt2x00/rt61pci.c     |  111 ++++++++-----------
 drivers/net/wireless/rt2x00/rt61pci.h     |    2 -
 drivers/net/wireless/rt2x00/rt73usb.c     |  112 +++++++++----------
 drivers/net/wireless/rt2x00/rt73usb.h     |    2 -
 22 files changed, 581 insertions(+), 557 deletions(-)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is the latest version bump of rt2x00: 2.1.8

Most important patches are from Gertjan, which reduce
the amount of pre-allocated DMA for all TX queues.
All PCI drivers now TX/RX all frame data directly
from/to the skb buffer saving kilobytes of allocated DMA
and several memcpy() statements.

This also allows a lot of code to be moved out of rt2x00pci/rt2x00usb
and into rt2x00lib which in turn makes management of everything
much easier.

Ivo

---
The following changes since commit 7b57047e2d34c243c4cf2d778df0b34bfdd82c8e:
  John W. Linville (1):
        iwlwifi: fix build breakage

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Gertjan van Wingerde (4):
      rt2x00: Properly clean up beacon skbs.
      rt2x00: Convert rt2x00 to use generic DMA-mapping API
      rt2x00: Centralize allocation of RX skbs.
      rt2x00: Replace statically allocated DMA buffers with mapped skb's.

Ivo van Doorn (5):
      rt2x00: Use ieee80211 fc handlers
      rt2x00: Cleanup symbol exports
      rt2x00: Fix sparse warning on nested container_of()
      rt2x00: Increase queue size
      rt2x00: Release rt2x00 2.1.8

 drivers/net/wireless/rt2x00/rt2400pci.c   |   17 ++--
 drivers/net/wireless/rt2x00/rt2500pci.c   |   14 ++-
 drivers/net/wireless/rt2x00/rt2500usb.c   |    4 +-
 drivers/net/wireless/rt2x00/rt2x00.h      |   59 ++---------
 drivers/net/wireless/rt2x00/rt2x00dev.c   |  100 +++++++++++++++----
 drivers/net/wireless/rt2x00/rt2x00lib.h   |   51 +++++++++-
 drivers/net/wireless/rt2x00/rt2x00pci.c   |  126 ++++--------------------
 drivers/net/wireless/rt2x00/rt2x00pci.h   |   12 --
 drivers/net/wireless/rt2x00/rt2x00queue.c |  157 +++++++++++++++++++++++------
 drivers/net/wireless/rt2x00/rt2x00queue.h |   35 ++++---
 drivers/net/wireless/rt2x00/rt2x00usb.c   |   94 +++---------------
 drivers/net/wireless/rt2x00/rt2x00usb.h   |    6 +
 drivers/net/wireless/rt2x00/rt61pci.c     |   23 +++--
 drivers/net/wireless/rt2x00/rt73usb.c     |    8 ++-
 14 files changed, 368 insertions(+), 338 deletions(-)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is the latest update for rt2x00

I think all patches qualify for 2.6.27, 
with the exception for first 2 patches:
      rt2x00: Remove duplicate declaration
      rt2x00: Fix EIFS timing value
but those are one-liners and have little impact.

The 3 patches from Iwo are the most important ones,
since that fixes a major bug in the beacon handling for the
USB drivers. The 3 patches are a bit big, but without them
beaconing simply won't work.

Ivo

---
The following changes since commit a520bdbe7d344296482f9355e29b0018ea58760f:
  John W. Linville (1):
        iwl-scan.c: fixup merge damage in wireless-testing#master

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ ..BRANCH.NOT.VERIFIED..

Ivo van Doorn (3):
      rt2x00: Remove duplicate declaration
      rt2x00: Fix EIFS timing value
      rt2x00: Fix GCC warning because aifs is now unsigned

Iwo Mergler (3):
      rt2x00: Support for large vendor requests
      rt2x00: Large vendor requests for rt73usb firmware upload and beacons
      rt2x00: Fix the beacon length bug

 drivers/net/wireless/rt2x00/rt2500usb.c |   12 +++++++
 drivers/net/wireless/rt2x00/rt2x00.h    |    2 +-
 drivers/net/wireless/rt2x00/rt2x00lib.h |    7 ----
 drivers/net/wireless/rt2x00/rt2x00mac.c |    5 +--
 drivers/net/wireless/rt2x00/rt2x00usb.c |   33 ++++++++++++++++++++
 drivers/net/wireless/rt2x00/rt2x00usb.h |   22 ++++++++++++-
 drivers/net/wireless/rt2x00/rt73usb.c   |   50 ++++++++++++------------------
 7 files changed, 87 insertions(+), 44 deletions(-)

Re: Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Please wait with pulling from rt2x00.git,
updated patches are coming in a few moments,
I just noticed some cleanups which should be made
in several patches, and I'll incorporate the suggestion
from Johannes regarding the EIFS.

Sorry for the noise. ;)

Ivo

> Here is the latest update for rt2x00
> 
> I think all patches qualify for 2.6.27, 
> with the exception for first 2 patches:
>       rt2x00: Remove duplicate declaration
>       rt2x00: Fix EIFS timing value
> but those are one-liners and have little impact.
> 
> The 3 patches from Iwo are the most important ones,
> since that fixes a major bug in the beacon handling for the
> USB drivers. The 3 patches are a bit big, but without them
> beaconing simply won't work.
> 
> Ivo
> 
> ---
> The following changes since commit a520bdbe7d344296482f9355e29b0018ea58760f:
>   John W. Linville (1):
>         iwl-scan.c: fixup merge damage in wireless-testing#master
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ ..BRANCH.NOT.VERIFIED..
> 
> Ivo van Doorn (3):
>       rt2x00: Remove duplicate declaration
>       rt2x00: Fix EIFS timing value
>       rt2x00: Fix GCC warning because aifs is now unsigned
> 
> Iwo Mergler (3):
>       rt2x00: Support for large vendor requests
>       rt2x00: Large vendor requests for rt73usb firmware upload and beacons
>       rt2x00: Fix the beacon length bug
> 
>  drivers/net/wireless/rt2x00/rt2500usb.c |   12 +++++++
>  drivers/net/wireless/rt2x00/rt2x00.h    |    2 +-
>  drivers/net/wireless/rt2x00/rt2x00lib.h |    7 ----
>  drivers/net/wireless/rt2x00/rt2x00mac.c |    5 +--
>  drivers/net/wireless/rt2x00/rt2x00usb.c |   33 ++++++++++++++++++++
>  drivers/net/wireless/rt2x00/rt2x00usb.h |   22 ++++++++++++-
>  drivers/net/wireless/rt2x00/rt73usb.c   |   50 ++++++++++++------------------
>  7 files changed, 87 insertions(+), 44 deletions(-)
> 

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is the updated patch series,
I have dropped the compile warning patch because Johannes has
already send it before, the EIFS patch has been updated to use the
correct definition instead of hardcoding the value, and some
coding style fixes went into Iwo's patches.

Patches are still intended for 2.6.27

Ivo

---
The following changes since commit a520bdbe7d344296482f9355e29b0018ea58760f:
  John W. Linville (1):
        iwl-scan.c: fixup merge damage in wireless-testing#master

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Ivo van Doorn (2):
      rt2x00: Remove duplicate declaration
      rt2x00: Fix EIFS timing value

Iwo Mergler (3):
      rt2x00: Support for large vendor requests
      rt2x00: Large vendor requests for rt73usb firmware upload and beacons
      rt2x00: Fix the beacon length bug

 drivers/net/wireless/rt2x00/rt2500usb.c    |   12 ++++++
 drivers/net/wireless/rt2x00/rt2x00.h       |    5 ++-
 drivers/net/wireless/rt2x00/rt2x00config.c |    2 +-
 drivers/net/wireless/rt2x00/rt2x00lib.h    |    7 ----
 drivers/net/wireless/rt2x00/rt2x00usb.c    |   32 +++++++++++++++++
 drivers/net/wireless/rt2x00/rt2x00usb.h    |   22 +++++++++++-
 drivers/net/wireless/rt2x00/rt73usb.c      |   52 +++++++++++----------------
 7 files changed, 90 insertions(+), 42 deletions(-)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Only 5 patches, but they do bump rt2x00 to a new version: 2.2.0
This series will add HW crypto support to rt2x00, by default it
has been enabled for rt61pci and rt73usb.

rt2500usb has also been created, but currently does not work
since it requires different handling then rt61pci and rt73usb. Because
I am focussing on different areas in rt2x00 now, it will take some
time before I get back to rt2500usb HW crypto (if there are any volunteers
to take a shot at rt2500usb HW crypto, they are welcome).

rt2500pci supports HW crypto as well, but I won't implement it due
to the way it has to be enabled. It comes down to the fact that during
TX the key has to be provided, and after the encryption an interupt will
be raised after which the frame can be kicked to the air. In the RX path
the same happens, including that after RX the key has to be provided
as well. This will cause the number of IRQ events to double during HW
crypto, and several changes are required in mac80211 to make it possible.
Because of that I see no point in doing anything with it.

Ivo

----
The following changes since commit 2471b779e2f93d76bd4c041e4a8f5a27c859d7ce:
  John W. Linville (1):
        Revert "mac80211: add direct probe before association"

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Ivo van Doorn (5):
      rt2x00: Implement HW encryption
      rt2x00: Implement HW encryption (rt61pci)
      rt2x00: Implement HW encryption (rt73usb)
      rt2x00: Gather channel information in structure
      rt2x00: Release rt2x00 2.2.0

 drivers/net/wireless/rt2x00/Kconfig        |    6 +
 drivers/net/wireless/rt2x00/Makefile       |    1 +
 drivers/net/wireless/rt2x00/rt2400pci.c    |   40 ++--
 drivers/net/wireless/rt2x00/rt2400pci.h    |   22 +--
 drivers/net/wireless/rt2x00/rt2500pci.c    |   39 +++--
 drivers/net/wireless/rt2x00/rt2500pci.h    |   17 +-
 drivers/net/wireless/rt2x00/rt2500usb.c    |   39 +++--
 drivers/net/wireless/rt2x00/rt2500usb.h    |   17 +-
 drivers/net/wireless/rt2x00/rt2x00.h       |   64 +++++-
 drivers/net/wireless/rt2x00/rt2x00config.c |    4 +
 drivers/net/wireless/rt2x00/rt2x00crypto.c |  215 +++++++++++++++++++
 drivers/net/wireless/rt2x00/rt2x00debug.c  |   97 +++++++++
 drivers/net/wireless/rt2x00/rt2x00dev.c    |   48 +++--
 drivers/net/wireless/rt2x00/rt2x00lib.h    |   47 ++++
 drivers/net/wireless/rt2x00/rt2x00mac.c    |  110 +++++++++-
 drivers/net/wireless/rt2x00/rt2x00queue.c  |   81 +++++++-
 drivers/net/wireless/rt2x00/rt2x00queue.h  |   73 ++++++-
 drivers/net/wireless/rt2x00/rt2x00reg.h    |   19 ++-
 drivers/net/wireless/rt2x00/rt61pci.c      |  298 ++++++++++++++++++++++++--
 drivers/net/wireless/rt2x00/rt61pci.h      |   38 ++--
 drivers/net/wireless/rt2x00/rt73usb.c      |  314 +++++++++++++++++++++++++---
 drivers/net/wireless/rt2x00/rt73usb.h      |   38 ++--
 22 files changed, 1418 insertions(+), 209 deletions(-)
 create mode 100644 drivers/net/wireless/rt2x00/rt2x00crypto.c

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is another rt2x00 update for the 2.6.28 kernel,
I believe some patches have been send earlier, but
I lost my overview on my patches, so this bunch will
get rt2x00 completely up to date.

A few patches are needed for rt2800, but they are small,
and clean enough to be merged early.

Ivo

---
The following changes since commit b51f3c6077d59b41e3f9d2af33e2e2f94ecbbc39:
  John W. Linville (1):
        at76_usb: fix for removal of IEEE80211_TX_CTL_DO_NOT_ENCRYPT

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Ivo van Doorn (5):
      rt2x00: Fix race conditions in flag handling
      rt2x00: Map extra_tx_headroom to DMA
      rt2x00: Initialize txop during conf_tx() callback
      rt2x00: Add Signal type flag
      rt2x00: Release rt2x00 2.2.1

Mattias Nissler (2):
      rt2x00: Only configure hardware when radio is enabled
      rt2x00: skb->data pointer should not include TX descriptor

 drivers/net/wireless/rt2x00/rt2400pci.c    |    2 +-
 drivers/net/wireless/rt2x00/rt2500pci.c    |    4 +-
 drivers/net/wireless/rt2x00/rt2500usb.c    |    7 ++-
 drivers/net/wireless/rt2x00/rt2x00.h       |   17 +++---
 drivers/net/wireless/rt2x00/rt2x00config.c |    4 +-
 drivers/net/wireless/rt2x00/rt2x00dev.c    |   68 +++++++++++--------------
 drivers/net/wireless/rt2x00/rt2x00mac.c    |   75 ++++++++++++++--------------
 drivers/net/wireless/rt2x00/rt2x00queue.c  |   31 +++++++++--
 drivers/net/wireless/rt2x00/rt2x00queue.h  |    9 ++-
 drivers/net/wireless/rt2x00/rt2x00rfkill.c |    6 +-
 drivers/net/wireless/rt2x00/rt2x00usb.c    |   21 ++++----
 drivers/net/wireless/rt2x00/rt61pci.c      |   73 ++++++++++++++++++++++-----
 drivers/net/wireless/rt2x00/rt73usb.c      |   74 ++++++++++++++++++++++-----
 13 files changed, 253 insertions(+), 138 deletions(-)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Well over a month since my last rt2x00 patches, but finally a real rt2x00 update.
The first 2 patches are updates based on recent mac80211 changes,
especially the configuration patch is important.

I also noticed that the recent Kconfig fixes introduced a possibility of a build error,
not sure if it was reported by somebody yet, but in any case it was possible to
build mac80211 as module and rt2x00 compiled into the kernel, causing obvious
problems.

Ivo

---
The following changes since commit 43288a0fdd6b970dec3017ceaffb70cf6347e5f0:
  John W. Linville (1):
        ath5k: fixup warnings created by "ath5k: Reset key cache..."

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Ivo van Doorn (5):
      rt2x00: Optimize configuration handling
      rt2x00: Remove ieee80211_bss_conf from rt2x00_intf
      rt2x00: Improve interface_modes initialization
      rt2x00: Fix build error when mac80211=M rt2x00=Y
      rt2x00: Release rt2x00 2.2.2

 drivers/net/wireless/rt2x00/Kconfig        |    2 +-
 drivers/net/wireless/rt2x00/rt2400pci.c    |  167 ++++++++++-----------
 drivers/net/wireless/rt2x00/rt2500pci.c    |  206 ++++++++++++-------------
 drivers/net/wireless/rt2x00/rt2500usb.c    |  110 ++++++-------
 drivers/net/wireless/rt2x00/rt2x00.h       |   44 ++----
 drivers/net/wireless/rt2x00/rt2x00config.c |  164 +++-----------------
 drivers/net/wireless/rt2x00/rt2x00dev.c    |   16 ++-
 drivers/net/wireless/rt2x00/rt2x00lib.h    |    3 +-
 drivers/net/wireless/rt2x00/rt2x00mac.c    |   12 +--
 drivers/net/wireless/rt2x00/rt61pci.c      |  231 ++++++++++++++--------------
 drivers/net/wireless/rt2x00/rt73usb.c      |  216 +++++++++++++-------------
 11 files changed, 501 insertions(+), 670 deletions(-)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is a new batch of updates for rt2x00.

The first patch (rt2x00: Optimize IV/EIV handling) was send individually
a few days ago, but it is probably easier if you pull it along with the rest
of the patches during this merge.

Small warning which might be important:
The patch "Implement HW encryption (rt2500usb)" adds support for HW crypto
but it does _not_ activate it. The module parameter "nohwcrypt" is set to 1
by default for now. This code has been sleeping in the rt2x00 experimental branch
for quite some time now, and doesn't work completely. I hope to debug this
further when I have time, but I am hoping that with the code in wireless-testing
other people will take a look at it to see what might be going wrong.

Ivo

---
The following changes since commit ca072018d6425a55b3f0e6d8bd3e6217ee509065:
  Winkler, Tomas (1):
        iwlwifi: TX update chicken bits

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Ivo van Doorn (5):
      rt2x00: Optimize IV/EIV handling
      rt2x00: Store retry limit values
      rt2x00: Remove duplicate code
      rt2x00: Implement HW encryption (rt2500usb)
      rt2x00: Release rt2x00 2.2.3

 drivers/net/wireless/rt2x00/Kconfig        |    1 +
 drivers/net/wireless/rt2x00/rt2500usb.c    |  132 ++++++++++++++++++++++++++-
 drivers/net/wireless/rt2x00/rt2500usb.h    |    3 +
 drivers/net/wireless/rt2x00/rt2x00.h       |    9 ++-
 drivers/net/wireless/rt2x00/rt2x00config.c |   39 +++++----
 drivers/net/wireless/rt2x00/rt2x00crypto.c |   56 ++++++------
 drivers/net/wireless/rt2x00/rt2x00lib.h    |    6 ++
 drivers/net/wireless/rt2x00/rt2x00mac.c    |    2 -
 drivers/net/wireless/rt2x00/rt2x00queue.c  |   17 ++--
 drivers/net/wireless/rt2x00/rt2x00queue.h  |   12 +--
 drivers/net/wireless/rt2x00/rt61pci.c      |    8 +-
 drivers/net/wireless/rt2x00/rt73usb.c      |    8 +-
 12 files changed, 211 insertions(+), 82 deletions(-)

Please pull 'upstream' branch of rt2x00

[Ivo van Doorn]

Hi John,

Here is the latest rt2x00 update.
Lots of new features, optimizations and cleanups.

Ivo

---
The following changes since commit 30b5741a6880688c4540c8f80f90371f42b05a63:
  Winkler, Tomas (1):
        iwl3945: use iwl_rb_status

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream

Andrey Yurovsky (1):
      rt2x00: Add mesh support

Ivo van Doorn (14):
      rt2x00: Implement Powersaving
      rt2x00: Move link tuning into seperate file
      rt2x00: Reduce calls to bbp_read()
      rt2x00: Restrict interface between rt2x00link and drivers
      rt2x00: Add RFKILL support to rt2500usb and rt73usb
      rt2x00: Rename CONFIG_CRYPTO_COPY_IV
      rt2x00: Implement WDS support
      rt2x00: Split EEPROM_NIC_TX_RX_FIXED
      rt2x00: Move code into seperate functions
      rt2x00: Remove ENTRY_TXD_OFDM_RATE
      rt2x00: Allow drivers to pass the noise value during rxdone
      rt2x00: Introduce RXDONE_SIGNAL_MASK mask
      rt2x00: Fix segementation fault
      rt2x00: Release rt2x00 2.3.0

 drivers/net/wireless/rt2x00/Makefile       |    1 +
 drivers/net/wireless/rt2x00/rt2400pci.c    |   60 +++-
 drivers/net/wireless/rt2x00/rt2500pci.c    |   88 ++++--
 drivers/net/wireless/rt2x00/rt2500usb.c    |   58 ++++-
 drivers/net/wireless/rt2x00/rt2500usb.h    |    8 +
 drivers/net/wireless/rt2x00/rt2x00.h       |  131 +++------
 drivers/net/wireless/rt2x00/rt2x00config.c |    7 +-
 drivers/net/wireless/rt2x00/rt2x00crypto.c |   13 +-
 drivers/net/wireless/rt2x00/rt2x00debug.c  |    4 +-
 drivers/net/wireless/rt2x00/rt2x00dev.c    |  322 ++------------------
 drivers/net/wireless/rt2x00/rt2x00lib.h    |   87 +++++-
 drivers/net/wireless/rt2x00/rt2x00link.c   |  461 ++++++++++++++++++++++++++++
 drivers/net/wireless/rt2x00/rt2x00mac.c    |   42 ++-
 drivers/net/wireless/rt2x00/rt2x00queue.c  |  193 ++++++------
 drivers/net/wireless/rt2x00/rt2x00queue.h  |   15 +-
 drivers/net/wireless/rt2x00/rt2x00reg.h    |   10 +
 drivers/net/wireless/rt2x00/rt2x00usb.c    |    6 +-
 drivers/net/wireless/rt2x00/rt61pci.c      |  144 +++++----
 drivers/net/wireless/rt2x00/rt61pci.h      |    7 +-
 drivers/net/wireless/rt2x00/rt73usb.c      |  134 ++++++---
 drivers/net/wireless/rt2x00/rt73usb.h      |   13 +
 21 files changed, 1138 insertions(+), 666 deletions(-)
 create mode 100644 drivers/net/wireless/rt2x00/rt2x00link.c