John,
Not so much (yet?), but here it goes ... I'm planning to pull in the CSA
work, of course.
The biggest thing here is probably Arik's TDLS rework, beyond that we
have smaller improvements and features like David's scanning IE thing,
Luca's queue work, some CSA work, etc. Also your PID rate control
removal, of course.
Let me know if any issues show up.
johannes
The following changes since commit 7171511eaec5bf23fb06078f59784a3a0626b38f:
Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git HEAD
for you to fetch changes up to 79c3cc0d22358a383b1196aea869e620ec2faf37:
mac80211: split sched scan IEs (2014-06-24 15:47:52 +0200)
----------------------------------------------------------------
Antonio Ospite (1):
trivial: net/mac80211/mesh.c: fix typo s/Substract/Subtract/
Arik Nemtsov (10):
mac80211: clarify TDLS Tx handling
mac80211: set auth flags after other station info
mac80211: cleanup TDLS state during failed setup
cfg80211: pass TDLS initiator in tdls_mgmt operations
mac80211: use TDLS initiator in tdls_mgmt operations
mac80211: split tdls_mgmt function
mac80211: implement proper Tx path flushing for TDLS
mac80211: add API to request TDLS operation from userspace
mac80211: make sure TDLS peer STA exists during setup
mac80211: protect TDLS discovery session
Bob Copeland (1):
mac80211: remove ignore_plink_timer flag
David Spinadel (2):
mac80211: support more than one band in scan request
mac80211: split sched scan IEs
Janusz Dziedzic (1):
mac80211: allow tx via monitor iface when DFS
Johannes Berg (4):
mac80211: fix station/driver powersave race
mac80211: remove weak WEP IV accounting
cfg80211: make ethtool the driver's responsibility
mac80211_hwsim: clean up own address matching
John W. Linville (1):
mac80211: remove PID rate control
Luciano Coelho (4):
mac80211: don't stop all queues when flushing
mac80211: introduce refcount for queue_stop_reasons
mac80211: add functions to stop and wake all queues assigned to a vif
mac80211: stop only the queues assigned to the vif during channel switch
Michal Kazior (2):
mac80211: move csa counters from sdata to beacon/presp
mac80211: use csa counter offsets instead of csa_active
Thomas Gleixner (2):
mac80211: Use ktime_get_ts()
net: Mac80211: Remove silly timespec dance
MAINTAINERS | 10 -
drivers/net/wireless/at76c50x-usb.c | 3 +-
drivers/net/wireless/ath/ath10k/mac.c | 3 +-
drivers/net/wireless/cw1200/scan.c | 3 +-
drivers/net/wireless/cw1200/scan.h | 2 +-
drivers/net/wireless/iwlegacy/common.c | 3 +-
drivers/net/wireless/iwlegacy/common.h | 2 +-
drivers/net/wireless/iwlwifi/dvm/mac80211.c | 3 +-
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 5 +-
drivers/net/wireless/iwlwifi/mvm/mvm.h | 2 +-
drivers/net/wireless/iwlwifi/mvm/scan.c | 27 +-
drivers/net/wireless/mac80211_hwsim.c | 69 ++--
drivers/net/wireless/mwifiex/cfg80211.c | 3 +-
drivers/net/wireless/ti/wl1251/main.c | 3 +-
drivers/net/wireless/ti/wl12xx/scan.c | 20 +-
drivers/net/wireless/ti/wl12xx/scan.h | 2 +-
drivers/net/wireless/ti/wl18xx/scan.c | 16 +-
drivers/net/wireless/ti/wl18xx/scan.h | 2 +-
drivers/net/wireless/ti/wlcore/cmd.c | 11 +-
drivers/net/wireless/ti/wlcore/cmd.h | 3 +-
drivers/net/wireless/ti/wlcore/main.c | 5 +-
drivers/net/wireless/ti/wlcore/scan.h | 2 +-
drivers/net/wireless/ti/wlcore/wlcore.h | 2 +-
include/linux/ieee80211.h | 3 +
include/net/cfg80211.h | 31 +-
include/net/mac80211.h | 65 +++-
include/uapi/linux/nl80211.h | 5 +
net/mac80211/Kconfig | 17 -
net/mac80211/Makefile | 6 +-
net/mac80211/agg-tx.c | 8 +-
net/mac80211/cfg.c | 473 ++++-----------------------
net/mac80211/debugfs_sta.c | 3 +-
net/mac80211/driver-ops.h | 20 +-
net/mac80211/ethtool.c | 244 ++++++++++++++
net/mac80211/ibss.c | 2 +-
net/mac80211/ieee80211_i.h | 57 +++-
net/mac80211/iface.c | 13 +-
net/mac80211/main.c | 10 +-
net/mac80211/mesh.c | 4 +-
net/mac80211/mesh_plink.c | 30 +-
net/mac80211/mlme.c | 35 +-
net/mac80211/offchannel.c | 6 +-
net/mac80211/pm.c | 6 +-
net/mac80211/rate.h | 13 -
net/mac80211/rc80211_pid.h | 278 ----------------
net/mac80211/rc80211_pid_algo.c | 478 ----------------------------
net/mac80211/rc80211_pid_debugfs.c | 228 -------------
net/mac80211/rx.c | 2 +
net/mac80211/scan.c | 118 ++++---
net/mac80211/sta_info.c | 201 ++++++++++--
net/mac80211/sta_info.h | 13 +-
net/mac80211/status.c | 7 +-
net/mac80211/tdls.c | 293 +++++++++++++++--
net/mac80211/trace.h | 7 +
net/mac80211/tx.c | 170 +++++-----
net/mac80211/util.c | 226 +++++++++----
net/mac80211/wep.c | 20 --
net/wireless/core.c | 3 -
net/wireless/ethtool.c | 86 +----
net/wireless/ethtool.h | 6 -
net/wireless/nl80211.c | 4 +
net/wireless/rdev-ops.h | 54 +---
net/wireless/trace.h | 59 +---
63 files changed, 1430 insertions(+), 2075 deletions(-)
create mode 100644 net/mac80211/ethtool.c
delete mode 100644 net/mac80211/rc80211_pid.h
delete mode 100644 net/mac80211/rc80211_pid_algo.c
delete mode 100644 net/mac80211/rc80211_pid_debugfs.c
delete mode 100644 net/wireless/ethtool.h
On Tue, 2014-06-24 at 18:22 +0200, Johannes Berg wrote:
> The biggest thing here is probably Arik's TDLS rework, beyond that we
> have smaller improvements and features like David's scanning IE thing,
The latter seems to cause some issues with the ath9k multi-channel code,
I didn't realize you'd merged that in.
The fix is not very difficult, so maybe you can just fix it when you
merge? See commit eb6a61549f530f1cc435512df3799f656094ba83 for how all
the other drivers were changed.
johannes
On Tue, Jun 24, 2014 at 07:07:58PM +0200, Johannes Berg wrote:
> On Tue, 2014-06-24 at 18:22 +0200, Johannes Berg wrote:
>
> > The biggest thing here is probably Arik's TDLS rework, beyond that we
> > have smaller improvements and features like David's scanning IE thing,
>
> The latter seems to cause some issues with the ath9k multi-channel code,
> I didn't realize you'd merged that in.
>
> The fix is not very difficult, so maybe you can just fix it when you
> merge? See commit eb6a61549f530f1cc435512df3799f656094ba83 for how all
> the other drivers were changed.
I don't see that commit ID anywhere...?
The merge seemed to be clean too. Are we looking at the same things?
John
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.
On Wed, Jun 25, 2014 at 03:18:34PM -0400, John W. Linville wrote:
> On Tue, Jun 24, 2014 at 07:07:58PM +0200, Johannes Berg wrote:
> > On Tue, 2014-06-24 at 18:22 +0200, Johannes Berg wrote:
> >
> > > The biggest thing here is probably Arik's TDLS rework, beyond that we
> > > have smaller improvements and features like David's scanning IE thing,
> >
> > The latter seems to cause some issues with the ath9k multi-channel code,
> > I didn't realize you'd merged that in.
> >
> > The fix is not very difficult, so maybe you can just fix it when you
> > merge? See commit eb6a61549f530f1cc435512df3799f656094ba83 for how all
> > the other drivers were changed.
>
> I don't see that commit ID anywhere...?
>
> The merge seemed to be clean too. Are we looking at the same things?
Perhaps you meant c56ef6725068c? That seems to have held the clues...
John
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.
On Tue, Jun 24, 2014 at 06:22:44PM +0200, Johannes Berg wrote:
> John,
>
> Not so much (yet?), but here it goes ... I'm planning to pull in the CSA
> work, of course.
>
> The biggest thing here is probably Arik's TDLS rework, beyond that we
> have smaller improvements and features like David's scanning IE thing,
> Luca's queue work, some CSA work, etc. Also your PID rate control
> removal, of course.
>
> Let me know if any issues show up.
>
> johannes
>
> The following changes since commit 7171511eaec5bf23fb06078f59784a3a0626b38f:
>
> Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git HEAD
>
> for you to fetch changes up to 79c3cc0d22358a383b1196aea869e620ec2faf37:
>
> mac80211: split sched scan IEs (2014-06-24 15:47:52 +0200)
Pulling now...
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.