mac80211: merge a few pending upstream fixes