projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0989bd0 7d65f82)
Merge tag 'mac80211-for-davem-2017-03-31' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Sat, 1 Apr 2017 20:31:15 +0000 (13:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 1 Apr 2017 20:31:15 +0000 (13:31 -0700)
commit612307c6bebc0651cf36b6bf76249898f595fd64
tree6b294dcd3806cce0bf1183c00248b02b7030cdfctree | snapshot
parent0989bd034a125cef29bd6351514d588fc616b39acommit | diff
parent7d65f82954dadbbe7b6e1aec7e07ad17bc6d958bcommit | diff
Merge tag 'mac80211-for-davem-2017-03-31' of git://git./linux/kernel/git/jberg/mac80211

Johannes Berg says:

====================
Two fixes:
 * don't block netdev queues (indefinitely!) if mac80211
   manages traffic queueing itself
 * check wiphy registration before checking for ops
   on resume, to avoid crash
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
John Crispins staging tree