Merge tag 'mac80211-for-davem-2015-05-26' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Tue, 26 May 2015 23:38:53 +0000 (19:38 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 May 2015 23:38:53 +0000 (19:38 -0400)
commitfe9066ade6a42a6f0bd22333e5831194104713ce
tree0b295f1663091a1de2e6ae1cdcca74d776a193aa
parent5f59102fdcfeee937439bb4a5e5c9dbc0d6eb4b0
parentf9dca80b98caac8b4bfb43a2edf1e9f877ccf322
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>