mac80211: merge AP VLAN / WDS related fixes