aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kivilinna <jussi.kivilinna@mbnet.fi>2009-11-16 05:49:43 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-11-16 14:17:13 -0500
commit634a555ce3ee5ea1fdcaee8b4ac9ce7b54f301ac (patch)
tree61612dfd1a3da43510c38e318228445cc553312c
parent6a62e5ef94f754892734f99e87ca3dedd3cef277 (diff)
rndis_wlan: handle NL80211_AUTHTYPE_AUTOMATIC
rndis_wlan didn't know about NL80211_AUTHTYPE_AUTOMATIC and simple setup with 'iwconfig wlan essid no-encrypt' would fail (ENOSUPP). v2: use NDIS_80211_AUTH_AUTO_SWITCH instead of _OPEN. This will make device try shared key auth first, then open. Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rndis_wlan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 54175b6fa86..aa1880add18 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -1072,6 +1072,8 @@ static int set_auth_mode(struct usbnet *usbdev, u32 wpa_version,
1072 auth_mode = NDIS_80211_AUTH_SHARED; 1072 auth_mode = NDIS_80211_AUTH_SHARED;
1073 else if (auth_type == NL80211_AUTHTYPE_OPEN_SYSTEM) 1073 else if (auth_type == NL80211_AUTHTYPE_OPEN_SYSTEM)
1074 auth_mode = NDIS_80211_AUTH_OPEN; 1074 auth_mode = NDIS_80211_AUTH_OPEN;
1075 else if (auth_type == NL80211_AUTHTYPE_AUTOMATIC)
1076 auth_mode = NDIS_80211_AUTH_AUTO_SWITCH;
1075 else 1077 else
1076 return -ENOTSUPP; 1078 return -ENOTSUPP;
1077 1079