mac80211: merge another round of upstream fixes

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38918 3c298f89-4303-0410-b956-a3cf2f4a3e73