mac80211: merge a number of upstream driver fixes/improvements