From: David S. Miller <davem@davemloft.net>
Date: Sat, 1 Apr 2017 20:31:15 +0000 (-0700)
Subject: Merge tag 'mac80211-for-davem-2017-03-31' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Tag: v4.14-rc1~1182^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=612307c6bebc0651cf36b6bf76249898f595fd64;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

612307c6bebc0651cf36b6bf76249898f595fd64