From: David S. Miller <davem@davemloft.net>
Date: Tue, 26 May 2015 23:38:53 +0000 (-0400)
Subject: Merge tag 'mac80211-for-davem-2015-05-26' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: v4.1-rc6~19^2~9
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=fe9066ade6a42a6f0bd22333e5831194104713ce

Merge tag 'mac80211-for-davem-2015-05-26' of git://git./linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
We have three more fixes:
 * AP_VLAN tailroom calculation fix, the bug leads to warnings
   along with dropped packets
 * NAPI context issue, calling napi_gro_receive() from a timer
   (obviously) can lead to crashes
 * remain-on-channel combining leads to dropped requests and not
   being able to finish certain operations, so remove it
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

fe9066ade6a42a6f0bd22333e5831194104713ce