mac80211: merge fix for carl9170 upstream regression