net/mac80211/ieee80211_i.h: fix-up merge damage