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)
commit67a72a58913ab0f2f239e771547a58987c266960
tree61261e32bcd7cb6ee062d40273707c522048a545
parent7729bad4fd95e48bcafcb2222c63a8a5cdc42f61
parenta17d93ff3a950fefaea40e4a4bf3669b9137c533
Merge tag 'mac80211-for-davem-2016-12-16' of git://git./linux/kernel/git/jberg/mac80211

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>