mac80211: merge upstream fixes