mac80211: merge changes from trunk and add back the !LINUX_2_4 dependency