Merge tag 'mac80211-for-davem-2016-12-16' of git://git.kernel.org/pub/scm/linux/kerne...
authorDavid S. Miller <davem@davemloft.net>
Sun, 18 Dec 2016 02:41:33 +0000 (21:41 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 18 Dec 2016 02:41:33 +0000 (21:41 -0500)
Johannes Berg says:

====================
Three fixes:
 * avoid a WARN_ON() when trying to use WEP with AP_VLANs
 * ensure enough headroom on mesh forwarding packets
 * don't report unknown/invalid rates to userspace
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge