| commit | 13fb6c2c7fe10ce39a5549c268e35341d83f2b3d | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Jun 02 10:37:11 2017 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Fri Jun 02 10:37:11 2017 -0400 |
| tree | f67e64e963439e105f540dc8d4d1f31f6110c853 | |
| parent | ac2629a4797fdc839f7a4775cc141e6f53e064cf [diff] | |
| parent | e165bc02a02c70e40d5c811c705ba269aeca0497 [diff] |
Merge tag 'mac80211-for-davem-2017-06-02' of git://git.kernel.org/pub/scm/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>