Merge tag 'mac80211-for-davem-2017-06-02' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Fri, 2 Jun 2017 14:37:11 +0000 (10:37 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Jun 2017 14:37:11 +0000 (10:37 -0400)
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>

Trivial merge