pull-request: mac80211 2015-05-28

pull-request: mac80211 2015-05-28

[Johannes Berg]

Hi Dave,

Please excuse the quick succession with another pull request - Ben
pointed out to me that a fix I'd applied on -next is actually needed on
4.1 - we'll have to live with it being in both I suppose. Sorry about
that.

johannes


The following changes since commit f9dca80b98caac8b4bfb43a2edf1e9f877ccf322:

  mac80211: fix AP_VLAN crypto tailroom calculation (2015-05-20 15:10:11 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git tags/mac80211-for-davem-2015-05-28

for you to fetch changes up to 3a7af58faa7829faa26026c245d2a8a44e9605c5:

  mac80211: Fix mac80211.h docbook comments (2015-05-28 14:37:43 +0200)

----------------------------------------------------------------
This just has a single docbook build fix. In my confusion
I'd already sent the same fix for -next, but Ben Hutchings
noted it's necessary in 4.1.

----------------------------------------------------------------
Jonathan Corbet (1):
      mac80211: Fix mac80211.h docbook comments

 include/net/mac80211.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: pull-request: mac80211 2015-05-28

[David Miller]

From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 28 May 2015 14:45:49 +0200

> Please excuse the quick succession with another pull request - Ben
> pointed out to me that a fix I'd applied on -next is actually needed on
> 4.1 - we'll have to live with it being in both I suppose. Sorry about
> that.

Pulled, thanks Johannes.