| Message ID | 1475252077-6165-1-git-send-email-johannes@sipsolutions.net |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Johannes Berg <johannes@sipsolutions.net> Date: Fri, 30 Sep 2016 18:14:36 +0200 > Last pull request before the merge window, since it's about to open :) > It seems that everyone finally agreed on the NAN (neighbor awareness > networking) APIs, so we have that, along with some other things. > > Let me know if there's any problem. Johannes, I merged net into net-next before trying to perform this pull and there are a few conflicts which I am not comfortable resolving on my own. Could you please look into this and send me a new pull request with the conflicts resolved? Thanks!
On Mon, 2016-10-03 at 01:54 -0400, David Miller wrote: > > Could you please look into this and send me a new pull request with > the conflicts resolved? > Sure, will do (tomorrow, we have a holiday today). Would you prefer I send you the merge resolution for your tree, or just pull in net for a new pull request? johannes
From: Johannes Berg <johannes@sipsolutions.net> Date: Mon, 03 Oct 2016 12:07:00 +0200 > On Mon, 2016-10-03 at 01:54 -0400, David Miller wrote: >> >> Could you please look into this and send me a new pull request with >> the conflicts resolved? >> > > Sure, will do (tomorrow, we have a holiday today). > > Would you prefer I send you the merge resolution for your tree, or just > pull in net for a new pull request? Resolve it using net-next since that is what I will pull it into.
Hi Dave, Last pull request before the merge window, since it's about to open :) It seems that everyone finally agreed on the NAN (neighbor awareness networking) APIs, so we have that, along with some other things. Let me know if there's any problem. Thanks, johannes The following changes since commit c13ed534b8db543e4d8ead3885f4b06585a5771c: Merge tag 'mac80211-next-for-davem-2016-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next (2016-09-18 22:29:08 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git tags/mac80211-next-for-davem-2016-09-30 for you to fetch changes up to bb42f2d13ffcd0baed7547b37d05add51fcd50e1: mac80211: Move reorder-sensitive TX handlers to after TXQ dequeue (2016-09-30 14:46:57 +0200) ---------------------------------------------------------------- This time around, we have * Neighbor Awareness Networking (NAN) APIs * a fix for a previous patch that caused memory corruption in wireless extensions key settings * beacon rate configuration for AP and mesh * memory limits for mac80211's internal TXQs * a (fairly involved) fix for the TXQ vs. crypto problems * direct cfg80211 driver API for WEP keys ---------------------------------------------------------------- Ayala Beker (9): cfg80211: add start / stop NAN commands mac80211: add boilerplate code for start / stop NAN cfg80211: add add_nan_func / del_nan_func cfg80211: allow the user space to change current NAN configuration cfg80211: provide a function to report a match for NAN cfg80211: Provide an API to report NAN function termination mac80211: implement nan_change_conf mac80211: Implement add_nan_func and rm_nan_func mac80211: Add API to report NAN function match David Spinadel (1): cfg80211: Add support for static WEP in the driver Johannes Berg (2): cfg80211: add checks for beacon rate, extend to mesh cfg80211: wext: really don't store non-WEP keys Pedersen, Thomas (2): mac80211: add offset_tsf driver op and use it for mesh mac80211: mesh: decrease max drift Purushottam Kushwaha (1): cfg80211: Add support to configure a beacon data rate Toke Høiland-Jørgensen (5): mac80211: Move ieee802111_tx_dequeue() to later in tx.c fq.h: Port memory limit mechanism from fq_codel mac80211: Export fq memory limit information in debugfs mac80211: Set lower memory limit for non-VHT devices mac80211: Move reorder-sensitive TX handlers to after TXQ dequeue include/net/cfg80211.h | 223 +++++++- include/net/fq.h | 3 + include/net/fq_impl.h | 7 +- include/net/mac80211.h | 75 +++ include/uapi/linux/nl80211.h | 270 ++++++++- net/mac80211/cfg.c | 208 +++++++ net/mac80211/chan.c | 6 + net/mac80211/debugfs.c | 8 + net/mac80211/debugfs_netdev.c | 12 +- net/mac80211/driver-ops.c | 15 + net/mac80211/driver-ops.h | 83 +++ net/mac80211/ieee80211_i.h | 26 + net/mac80211/iface.c | 28 +- net/mac80211/main.c | 8 + net/mac80211/mesh_sync.c | 12 +- net/mac80211/offchannel.c | 4 +- net/mac80211/rx.c | 7 +- net/mac80211/sta_info.c | 10 +- net/mac80211/trace.h | 159 ++++++ net/mac80211/tx.c | 351 ++++++++---- net/mac80211/util.c | 61 ++- net/wireless/chan.c | 2 + net/wireless/core.c | 35 ++ net/wireless/core.h | 7 +- net/wireless/ibss.c | 5 +- net/wireless/mlme.c | 1 + net/wireless/nl80211.c | 1220 ++++++++++++++++++++++++++++++++--------- net/wireless/rdev-ops.h | 58 ++ net/wireless/sme.c | 6 +- net/wireless/trace.h | 90 +++ net/wireless/util.c | 30 +- net/wireless/wext-compat.c | 14 +- net/wireless/wext-sme.c | 2 +- 33 files changed, 2648 insertions(+), 398 deletions(-)