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>

diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c
index 93505f93bf97711019e86bbe27f39f4f727bce01..8e65ffc4cb0a03b2d7ce91cc702c1657b3520340 100644 (file)
--- 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,
                 */
                break;
 
+       case IW_AUTH_MFP:
+               /* Management Frame Protection not supported.
+                * Only fail if set to required.
+                */
+               if (param->value == IW_AUTH_MFP_REQUIRED)
+                       ret = -EINVAL;
+               break;
+
        case IW_AUTH_KEY_MGMT:
                /* wl_lkm implies value 2 == PSK for Hermes I
                 * which ties in with WEXT