commit | 612307c6bebc0651cf36b6bf76249898f595fd64 | [log] [tgz] |
---|---|---|
author | David S. Miller <davem@davemloft.net> | Sat Apr 01 13:31:15 2017 -0700 |
committer | David S. Miller <davem@davemloft.net> | Sat Apr 01 13:31:15 2017 -0700 |
tree | 6b294dcd3806cce0bf1183c00248b02b7030cdfc | |
parent | 0989bd034a125cef29bd6351514d588fc616b39a [diff] | |
parent | 7d65f82954dadbbe7b6e1aec7e07ad17bc6d958b [diff] |
Merge tag 'mac80211-for-davem-2017-03-31' of git://git.kernel.org/pub/scm/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>