mac80211: merge the upstream ht40 fix