aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/orinoco
diff options
context:
space:
mode:
authorDavid Kilroy <kilroyd@googlemail.com>2010-12-02 13:19:21 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-12-07 16:09:12 -0500
commit329b32fedc94fd9158f1635ac64f4ae6a00d374c (patch)
treea7e3c724c5bf49bd5bab4a6faed9768ca7bf79af /drivers/net/wireless/orinoco
parent541a45a142df281c974d74eac2066138fc107b23 (diff)
orinoco: allow IW_AUTH_MFP to pass through
The card doesn't support MFP, so silently accept DISABLED and OPTIONAL settings. This avoids the following failure in wpa_supplicant logs: State: SCANNING -> ASSOCIATING wpa_driver_wext_set_operstate: operstate 0->0 (DORMANT) netlink: Operstate: linkmode=-1, operstate=5 wpa_driver_wext_associate wpa_driver_wext_set_drop_unencrypted wpa_driver_wext_set_psk wpa_driver_wext_associate: assoc failed because set_auth_param(IW_AUTH_MFP) failed Association request to the driver failed Signed-off by: David Kilroy <kilroyd@googlemail.com> Reported by: Giacomo Comes <comes@naic.edu> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco')
-rw-r--r--drivers/net/wireless/orinoco/wext.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c
index 93505f93bf9..8e65ffc4cb0 100644
--- a/drivers/net/wireless/orinoco/wext.c
+++ b/drivers/net/wireless/orinoco/wext.c
@@ -893,6 +893,14 @@ static int orinoco_ioctl_set_auth(struct net_device *dev,
893 */ 893 */
894 break; 894 break;
895 895
896 case IW_AUTH_MFP:
897 /* Management Frame Protection not supported.
898 * Only fail if set to required.
899 */
900 if (param->value == IW_AUTH_MFP_REQUIRED)
901 ret = -EINVAL;
902 break;
903
896 case IW_AUTH_KEY_MGMT: 904 case IW_AUTH_KEY_MGMT:
897 /* wl_lkm implies value 2 == PSK for Hermes I 905 /* wl_lkm implies value 2 == PSK for Hermes I
898 * which ties in with WEXT 906 * which ties in with WEXT