Skip to content

mac80211 aggregation improvements

Johannes Berg linux-wireless 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest8 patches 29 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/8mac80211: rewrite fragmentationnet/mac80211/ieee80211_i.h net/mac80211/tx.c net/mac80211/util.c +2 more+175 -2265 replies
2/8mac80211: fix A-MPDU queue assignmentnet/mac80211/tx.c+27 -81 reply
3/8mac80211: rework the pending packets codenet/mac80211/ieee80211_i.h net/mac80211/main.c net/mac80211/tx.c +1 more+97 -782 replies
4/8mac80211: clean up __ieee80211_tx argsnet/mac80211/tx.c+16 -151 reply
5/8mac80211: unify and fix TX aggregation startdrivers/net/wireless/ath9k/main.c include/net/mac80211.h net/mac80211/agg-tx.c+30 -393 replies
6/8mac80211: add skb length sanity checkingnet/mac80211/tx.c+6 -13 replies
7/8mac80211: fix aggregation to not require queue stopinclude/net/mac80211.h net/mac80211/agg-tx.c net/mac80211/ieee80211_i.h +4 more+221 -789 replies
8/8mac80211/iwlwifi: move virtual A-MDPU queue bookkeeping to iwlwifidrivers/net/wireless/iwlwifi/iwl-3945.c drivers/net/wireless/iwlwifi/iwl-4965.c drivers/net/wireless/iwlwifi/iwl-5000.c +14 more+84 -1691 reply

Reviews trailers per patch

5 of 8 patches have a Reviewed-by or Acked-by.

PatchLuis R. Rodriguez
1/8
2/8R-b
3/8R-b
4/8R-b
5/8R-b
6/8
7/8
8/8R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 0/8] mac80211 aggregation improvements

Hi,

Here's my patch set for improving aggregation, it contains

* mac80211: rewrite fragmentation
* mac80211: fix A-MPDU queue assignment
* mac80211: rework the pending packets code
* mac80211: clean up __ieee80211_tx args
* mac80211: unify and fix TX aggregation start
* mac80211: add skb length sanity checking
* mac80211: fix aggregation to not require queue stop
* mac80211/iwlwifi: move virtual A-MDPU queue bookkeeping to iwlwifi

The skb length sanity checking isn't strictly part of this series, but it would help debug things like the zd1211 problem Jouni fixed recently, and I wanted to do it after the third patch due to the amount of code changes in that.

The rest of the code changes fix/rework some things related to pending frames and fragmentation (to be able to work with that code for pending aggregation frames), clean up some aggregation code and finally remove a lot of the code that was necessary for trying to handle hardware aggregation queues in mac80211 -- the code for handling it in the driver is much simpler (because it can be less generic) too.

Despite adding new features, long comments and reworking things the diffstat thus looks fairly good with not many new code lines in total:

 drivers/net/wireless/ath9k/main.c           |    2
 drivers/net/wireless/iwlwifi/iwl-3945.c     |    2
 drivers/net/wireless/iwlwifi/iwl-4965.c     |    7
 drivers/net/wireless/iwlwifi/iwl-5000.c     |    7
 drivers/net/wireless/iwlwifi/iwl-core.c     |    3
 drivers/net/wireless/iwlwifi/iwl-dev.h      |    6
 drivers/net/wireless/iwlwifi/iwl-helpers.h  |   52 ++
 drivers/net/wireless/iwlwifi/iwl-tx.c       |    8   
 drivers/net/wireless/iwlwifi/iwl3945-base.c |    2   
 drivers/net/wireless/mac80211_hwsim.c       |    1   
 include/net/mac80211.h                      |   22   
 net/mac80211/agg-tx.c                       |  243 ++++-----
 net/mac80211/ieee80211_i.h                  |   31 -
 net/mac80211/main.c                         |   13  
 net/mac80211/sta_info.c                     |   17  
 net/mac80211/sta_info.h                     |    4  
 net/mac80211/tx.c                           |  704 +++++++++++++++-------------
 net/mac80211/util.c                         |   97 +--
 net/mac80211/wep.c                          |   21    
 net/mac80211/wpa.c                          |   28 -  
 20 files changed, 656 insertions(+), 614 deletions(-) 

I've tested this with various Intel hardware, Sujith has also tested with ath9k hardware (thanks!)

johannes