mac80211: merge another round of upstream fixes