projects / linux / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ac2629a e165bc0)
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)
commit13fb6c2c7fe10ce39a5549c268e35341d83f2b3d
treef67e64e963439e105f540dc8d4d1f31f6110c853tree | snapshot
parentac2629a4797fdc839f7a4775cc141e6f53e064cfcommit | diff
parente165bc02a02c70e40d5c811c705ba269aeca0497commit | diff
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>
https://github.com/torvalds/linux.git