mac80211: merge fixes from r25358, r25359