aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/nl80211.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/wireless/nl80211.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/wireless/nl80211.c')
-rw-r--r--net/wireless/nl80211.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 66024ef57bab..cad281390cfa 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -126,6 +126,7 @@ static struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] __read_mostly = {
126 [NL80211_ATTR_STA_FLAGS2] = { 126 [NL80211_ATTR_STA_FLAGS2] = {
127 .len = sizeof(struct nl80211_sta_flag_update), 127 .len = sizeof(struct nl80211_sta_flag_update),
128 }, 128 },
129 [NL80211_ATTR_CONTROL_PORT] = { .type = NLA_FLAG },
129}; 130};
130 131
131/* IE validation */ 132/* IE validation */
@@ -3040,6 +3041,8 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)
3040 } 3041 }
3041 } 3042 }
3042 3043
3044 req.control_port = info->attrs[NL80211_ATTR_CONTROL_PORT];
3045
3043 err = drv->ops->assoc(&drv->wiphy, dev, &req); 3046 err = drv->ops->assoc(&drv->wiphy, dev, &req);
3044 3047
3045out: 3048out: