mac80211: merge some pending fixes