* pull-request: mac80211 2014-10-23
@ 2014-10-23 18:35 Johannes Berg
2014-10-27 17:39 ` John W. Linville
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Berg @ 2014-10-23 18:35 UTC (permalink / raw)
To: John Linville; +Cc: linux-wireless
John,
Please pull the below changes for the current 3.18 preparations. More
details below.
Thanks,
johannes
---
The following changes since commit
35a9ad8af0bb0fa3525e6d0d20e32551d226f38e:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next (2014-10-08 21:40:54 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
tags/mac80211-for-john-2014-10-23
for you to fetch changes up to 11b2357d5dbce999803e9055f8c09829a8a87db4:
mac80211: minstrels: fix buffer overflow in HT debugfs rc_stats
(2014-10-20 16:37:01 +0200)
----------------------------------------------------------------
Here are a few fixes for the wireless stack: one fixes the
RTS rate, one for a debugfs file, one to return the correct
channel to userspace, a sanity check for a userspace value
and the remaining two are just documentation fixes.
----------------------------------------------------------------
Fabian Frederick (1):
net: rfkill: kernel-doc warning fixes
Karl Beldan (2):
mac80211: fix typo in starting baserate for rts_cts_rate_idx
mac80211: minstrels: fix buffer overflow in HT debugfs rc_stats
Liad Kaufman (1):
mac80211: fix warning on htmldocs for last_tdls_pkt_time
Luciano Coelho (2):
mac80211: return the vif's chandef in ieee80211_cfg_get_channel()
nl80211: sanity check the channel switch counter value
net/mac80211/cfg.c | 2 +-
net/mac80211/rate.c | 2 +-
net/mac80211/rc80211_minstrel_debugfs.c | 12 +++++++-----
net/mac80211/rc80211_minstrel_ht_debugfs.c | 13 ++++++++-----
net/mac80211/sta_info.h | 1 +
net/rfkill/core.c | 4 ++--
net/wireless/nl80211.c | 10 +++++++++-
7 files changed, 29 insertions(+), 15 deletions(-)
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: pull-request: mac80211 2014-10-23
2014-10-23 18:35 pull-request: mac80211 2014-10-23 Johannes Berg
@ 2014-10-27 17:39 ` John W. Linville
0 siblings, 0 replies; 2+ messages in thread
From: John W. Linville @ 2014-10-27 17:39 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless
On Thu, Oct 23, 2014 at 08:35:36PM +0200, Johannes Berg wrote:
> John,
>
> Please pull the below changes for the current 3.18 preparations. More
> details below.
>
> Thanks,
> johannes
>
> ---
>
> The following changes since commit
> 35a9ad8af0bb0fa3525e6d0d20e32551d226f38e:
>
> Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next (2014-10-08 21:40:54 -0400)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
> tags/mac80211-for-john-2014-10-23
>
> for you to fetch changes up to 11b2357d5dbce999803e9055f8c09829a8a87db4:
>
> mac80211: minstrels: fix buffer overflow in HT debugfs rc_stats
> (2014-10-20 16:37:01 +0200)
>
> ----------------------------------------------------------------
> Here are a few fixes for the wireless stack: one fixes the
> RTS rate, one for a debugfs file, one to return the correct
> channel to userspace, a sanity check for a userspace value
> and the remaining two are just documentation fixes.
>
> ----------------------------------------------------------------
> Fabian Frederick (1):
> net: rfkill: kernel-doc warning fixes
>
> Karl Beldan (2):
> mac80211: fix typo in starting baserate for rts_cts_rate_idx
> mac80211: minstrels: fix buffer overflow in HT debugfs rc_stats
>
> Liad Kaufman (1):
> mac80211: fix warning on htmldocs for last_tdls_pkt_time
>
> Luciano Coelho (2):
> mac80211: return the vif's chandef in ieee80211_cfg_get_channel()
> nl80211: sanity check the channel switch counter value
>
> net/mac80211/cfg.c | 2 +-
> net/mac80211/rate.c | 2 +-
> net/mac80211/rc80211_minstrel_debugfs.c | 12 +++++++-----
> net/mac80211/rc80211_minstrel_ht_debugfs.c | 13 ++++++++-----
> net/mac80211/sta_info.h | 1 +
> net/rfkill/core.c | 4 ++--
> net/wireless/nl80211.c | 10 +++++++++-
> 7 files changed, 29 insertions(+), 15 deletions(-)
Pulling now...
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-27 17:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-23 18:35 pull-request: mac80211 2014-10-23 Johannes Berg
2014-10-27 17:39 ` John W. Linville
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).