mac80211: merge a 4-addr client mode fix