diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-08-27 07:26:54 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-08-27 13:27:07 -0400 |
commit | a621fa4d6a7fdf9d34938d2e129a72624833eeeb (patch) | |
tree | 1b15e9fabbec3b2bdf04f5cd60526c0154a0dcc1 /net/mac80211/mlme.c | |
parent | c0692b8fe29fb4d4dad33487aabf3ed7e1e880c0 (diff) |
mac80211: allow changing port control protocol
Some vendor specified mechanisms for 802.1X-style
functionality use a different protocol than EAP
(even if EAP is vendor-extensible). Support this
in mac80211 via the cfg80211 API for it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 5282ac18d2cf..0cb429657474 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -2262,6 +2262,9 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, | |||
2262 | else | 2262 | else |
2263 | ifmgd->flags &= ~IEEE80211_STA_CONTROL_PORT; | 2263 | ifmgd->flags &= ~IEEE80211_STA_CONTROL_PORT; |
2264 | 2264 | ||
2265 | sdata->control_port_protocol = req->crypto.control_port_ethertype; | ||
2266 | sdata->control_port_no_encrypt = req->crypto.control_port_no_encrypt; | ||
2267 | |||
2265 | ieee80211_add_work(wk); | 2268 | ieee80211_add_work(wk); |
2266 | return 0; | 2269 | return 0; |
2267 | } | 2270 | } |