Merge upstream net/ieee80211.h changes into 'ieee80211' branch.