mac80211: merge some upstream fixes