From: David S. Miller <davem@davemloft.net>
Date: Fri, 2 Jun 2017 14:37:11 +0000 (-0400)
Subject: Merge tag 'mac80211-for-davem-2017-06-02' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=13fb6c2c7fe10ce39a5549c268e35341d83f2b3d;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'mac80211-for-davem-2017-06-02' of git://git./linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
Just two fixes:
 * fix the per-CPU drop counters to not be added to the
   rx_packets counter, but really the drop counter
 * fix TX aggregation start/stop callback races by setting
   bits instead of allocating and queueing an skb
====================

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

13fb6c2c7fe10ce39a5549c268e35341d83f2b3d