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 <[email protected]>
Reported by: Giacomo Comes <[email protected]>
---
Compile tested. I'm not sure this fixes the issue, because it looks like
wpa_supplicant is still waiting for authentication to succeed. However,
it has probably not called the commit handler.
---
drivers/net/wireless/orinoco/wext.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c
index cf7be1e..519e01e 100644
--- a/drivers/net/wireless/orinoco/wext.c
+++ b/drivers/net/wireless/orinoco/wext.c
@@ -886,6 +886,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
--
1.7.2.2
On Thu, Dec 2, 2010 at 6:19 PM, David Kilroy <[email protected]> wrote:
> The card doesn't support MFP, so silently accept DISABLED and OPTIONAL
> settings.
>
> Signed-off by: David Kilroy <[email protected]>
> Reported by: Giacomo Comes <[email protected]>
> ---
>
> Compile tested. I'm not sure this fixes the issue, because it looks like
> wpa_supplicant is still waiting for authentication to succeed. However,
> it has probably not called the commit handler.
John, in case you missed it in the other orinoco thread, Giacomo has
confirmed this patch works.
Dave.