aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2009-05-11 14:57:57 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-05-13 15:44:37 -0400
commit3f77316c6b99f596bfbf72c0542f47f7230b702e (patch)
treed9c8634e62917687c9a2741fdd72dd2c19c04727 /net/mac80211/cfg.c
parenteccb8e8f0c3af47aeb6dbe4012eb8d4fc888767a (diff)
nl80211: Add IEEE 802.1X PAE control for station mode
Add a new NL80211_ATTR_CONTROL_PORT flag for NL80211_CMD_ASSOCIATE to allow user space to indicate that it will control the IEEE 802.1X port in station mode. Previously, mac80211 was always marking the port authorized in station mode. This was enough when drop_unencrypted flag was set. However, drop_unencrypted can currently be controlled only with WEXT and the current nl80211 design does not allow fully secure configuration. Fix this by providing a mechanism for user space to control the IEEE 802.1X port in station mode (i.e., do the same that we are already doing in AP mode). Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index d591a936f5c4..6464bfd232c9 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1265,6 +1265,11 @@ static int ieee80211_assoc(struct wiphy *wiphy, struct net_device *dev,
1265 sdata->u.mgd.flags &= ~IEEE80211_STA_MFP_ENABLED; 1265 sdata->u.mgd.flags &= ~IEEE80211_STA_MFP_ENABLED;
1266 } 1266 }
1267 1267
1268 if (req->control_port)
1269 sdata->u.mgd.flags |= IEEE80211_STA_CONTROL_PORT;
1270 else
1271 sdata->u.mgd.flags &= ~IEEE80211_STA_CONTROL_PORT;
1272
1268 sdata->u.mgd.flags |= IEEE80211_STA_EXT_SME; 1273 sdata->u.mgd.flags |= IEEE80211_STA_EXT_SME;
1269 sdata->u.mgd.state = IEEE80211_STA_MLME_ASSOCIATE; 1274 sdata->u.mgd.state = IEEE80211_STA_MLME_ASSOCIATE;
1270 ieee80211_sta_req_auth(sdata); 1275 ieee80211_sta_req_auth(sdata);