mac80211: split up and insert custom IEs correctly
authorJohannes Berg <johannes@sipsolutions.net>
Wed, 23 Dec 2009 12:15:38 +0000 (13:15 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Dec 2009 21:54:58 +0000 (16:54 -0500)
commit8e664fb3fd2b04e3ac5fad7f046000ba54e0e275
treecf811ffed7d7643b72608a5eebd25baffd57fcb3
parent77c8144ad3ee7fae834e13cb7e83f5b7c8c5329e
mac80211: split up and insert custom IEs correctly

Currently, we insert all user-specified IEs before the HT
IE for association, and after the HT IE for probe requests.
For association, that's correct only if the user-specified
IEs are RSN only, incorrect in all other cases including
WPA. Change this to split apart the user-specified IEs in
two places for association: before the HT IE (e.g. RSN),
after the HT IE (generally empty right now I think?) and
after WMM (all other vendor-specific IEs). For probes,
split the IEs in different places to be correct according
to the spec.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
include/linux/ieee80211.h
net/mac80211/ieee80211_i.h
net/mac80211/util.c
net/mac80211/work.c