* pull-request: mac80211-next 2018-01-22
@ 2018-01-22 13:15 ` Johannes Berg
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Berg @ 2018-01-22 13:15 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-wireless
Hi Dave,
A few more (only four, really) changes have come in, so I figured
since the merge window hasn't opened yesterday, I'd still send them
to you.
Please pull and let me know if there's any problem.
Thanks,
johannes
The following changes since commit 564737f981fb4b4b3266901508bb9b90d9d43de8:
Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue (2018-01-14 12:25:04 -0500)
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-2018-01-22
for you to fetch changes up to 0ddcff49b672239dda94d70d0fcf50317a9f4b51:
mac80211_hwsim: fix possible memory leak in hwsim_new_radio_nl() (2018-01-22 14:03:29 +0100)
----------------------------------------------------------------
Less than a handful of changes:
* possible memory leak fix in hwsim
* speed up hwsim
* add hwsim userspace rate control API
* code cleanups
----------------------------------------------------------------
Benjamin Beichler (2):
mac80211_hwsim: add hashtable with mac address keys for faster lookup
mac80211_hwsim: add hwsim_tx_rate_flags to netlink attributes
Christopher Díaz Riveros (1):
debugfs_sta: Remove unneeded semicolons
weiyongjun (A) (1):
mac80211_hwsim: fix possible memory leak in hwsim_new_radio_nl()
drivers/net/wireless/mac80211_hwsim.c | 95 ++++++++++++++++++++++++++++-------
drivers/net/wireless/mac80211_hwsim.h | 68 ++++++++++++++++++++++++-
net/mac80211/debugfs_sta.c | 4 +-
3 files changed, 146 insertions(+), 21 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* pull-request: mac80211-next 2018-01-22
@ 2018-01-22 13:15 ` Johannes Berg
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Berg @ 2018-01-22 13:15 UTC (permalink / raw)
To: David Miller
Cc: netdev-u79uwXL29TY76Z2rM5mHXA, linux-wireless-u79uwXL29TY76Z2rM5mHXA
Hi Dave,
A few more (only four, really) changes have come in, so I figured
since the merge window hasn't opened yesterday, I'd still send them
to you.
Please pull and let me know if there's any problem.
Thanks,
johannes
The following changes since commit 564737f981fb4b4b3266901508bb9b90d9d43de8:
Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue (2018-01-14 12:25:04 -0500)
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-2018-01-22
for you to fetch changes up to 0ddcff49b672239dda94d70d0fcf50317a9f4b51:
mac80211_hwsim: fix possible memory leak in hwsim_new_radio_nl() (2018-01-22 14:03:29 +0100)
----------------------------------------------------------------
Less than a handful of changes:
* possible memory leak fix in hwsim
* speed up hwsim
* add hwsim userspace rate control API
* code cleanups
----------------------------------------------------------------
Benjamin Beichler (2):
mac80211_hwsim: add hashtable with mac address keys for faster lookup
mac80211_hwsim: add hwsim_tx_rate_flags to netlink attributes
Christopher Díaz Riveros (1):
debugfs_sta: Remove unneeded semicolons
weiyongjun (A) (1):
mac80211_hwsim: fix possible memory leak in hwsim_new_radio_nl()
drivers/net/wireless/mac80211_hwsim.c | 95 ++++++++++++++++++++++++++++-------
drivers/net/wireless/mac80211_hwsim.h | 68 ++++++++++++++++++++++++-
net/mac80211/debugfs_sta.c | 4 +-
3 files changed, 146 insertions(+), 21 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: pull-request: mac80211-next 2018-01-22
2018-01-22 13:15 ` Johannes Berg
(?)
@ 2018-01-22 15:17 ` David Miller
2018-01-22 15:31 ` Johannes Berg
-1 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2018-01-22 15:17 UTC (permalink / raw)
To: johannes; +Cc: netdev, linux-wireless
From: Johannes Berg <johannes@sipsolutions.net>
Date: Mon, 22 Jan 2018 14:15:00 +0100
> A few more (only four, really) changes have come in, so I figured
> since the merge window hasn't opened yesterday, I'd still send them
> to you.
>
> Please pull and let me know if there's any problem.
I had to resolve a conflict in mac80211_hwsim.c, please check my
resolution and send me any fixes which are necessary.
Thank you.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: pull-request: mac80211-next 2018-01-22
@ 2018-01-22 15:31 ` Johannes Berg
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Berg @ 2018-01-22 15:31 UTC (permalink / raw)
To: David Miller; +Cc: netdev, linux-wireless
On Mon, 2018-01-22 at 10:17 -0500, David Miller wrote:
> From: Johannes Berg <johannes@sipsolutions.net>
> Date: Mon, 22 Jan 2018 14:15:00 +0100
>
> > A few more (only four, really) changes have come in, so I figured
> > since the merge window hasn't opened yesterday, I'd still send them
> > to you.
> >
> > Please pull and let me know if there's any problem.
>
> I had to resolve a conflict in mac80211_hwsim.c, please check my
> resolution and send me any fixes which are necessary.
Sorry, my bad, I apologize. I knew about this and didn't think of it
when writing the pull request.
Resolution looks good - I was worried about the destruction order for a
second there, but it doesn't actually matter.
Thanks!
johannes
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: pull-request: mac80211-next 2018-01-22
@ 2018-01-22 15:31 ` Johannes Berg
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Berg @ 2018-01-22 15:31 UTC (permalink / raw)
To: David Miller
Cc: netdev-u79uwXL29TY76Z2rM5mHXA, linux-wireless-u79uwXL29TY76Z2rM5mHXA
On Mon, 2018-01-22 at 10:17 -0500, David Miller wrote:
> From: Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
> Date: Mon, 22 Jan 2018 14:15:00 +0100
>
> > A few more (only four, really) changes have come in, so I figured
> > since the merge window hasn't opened yesterday, I'd still send them
> > to you.
> >
> > Please pull and let me know if there's any problem.
>
> I had to resolve a conflict in mac80211_hwsim.c, please check my
> resolution and send me any fixes which are necessary.
Sorry, my bad, I apologize. I knew about this and didn't think of it
when writing the pull request.
Resolution looks good - I was worried about the destruction order for a
second there, but it doesn't actually matter.
Thanks!
johannes
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-01-22 15:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-22 13:15 pull-request: mac80211-next 2018-01-22 Johannes Berg
2018-01-22 13:15 ` Johannes Berg
2018-01-22 15:17 ` David Miller
2018-01-22 15:31 ` Johannes Berg
2018-01-22 15:31 ` Johannes Berg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.