From patchwork Thu Dec 2 18:19:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave X-Patchwork-Id: 375501 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB2IJaWI012859 for ; Thu, 2 Dec 2010 18:19:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757199Ab0LBSTe (ORCPT ); Thu, 2 Dec 2010 13:19:34 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:41677 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756171Ab0LBSTd (ORCPT ); Thu, 2 Dec 2010 13:19:33 -0500 Received: by wyb28 with SMTP id 28so8501932wyb.19 for ; Thu, 02 Dec 2010 10:19:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=i7iW+CWnZTvtob0aw62M2cppnuRZV5R9Vyitm0gk6is=; b=GdchGVCU6taBLP2srT86saPvRJFrpF9SmjVrCJKXC3vt/JG5TJbQOx4BKVtkRo3Ymv Hhcr/dcKAoNV4sOt0zRIwlZEx3wJAaAMiN604ZFrJkbiu4F/p7sEpVWK69pSDxsKCtnU pPhigkAh3vvz+2phqF8JiyGK9BIGQ4fhWJNRA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=tWjKvxq3ZKgtEDoDpP6ehm4+DZjZFqfBHegJvGW9O2PDelzBC0avQjsE24xwgKnnG8 jmlcuuHceBurmIUP+CjTEmicdy/Ci41CL6mfqgKsnGvjcylnYJkxATjqh8Utp5Z+FQjs jwvBaUrn3E285vinCnZnc7R4BgmVY/DPqh930= Received: by 10.216.20.66 with SMTP id o44mr543284weo.59.1291313972668; Thu, 02 Dec 2010 10:19:32 -0800 (PST) Received: from localhost.localdomain (5e0c75e0.bb.sky.com [94.12.117.224]) by mx.google.com with ESMTPS id x6sm420524weq.37.2010.12.02.10.19.31 (version=SSLv3 cipher=RC4-MD5); Thu, 02 Dec 2010 10:19:32 -0800 (PST) From: David Kilroy To: linux-wireless@vger.kernel.org Cc: comes@naic.edu, David Kilroy Subject: [PATCH] orinoco: allow IW_AUTH_MFP to pass through Date: Thu, 2 Dec 2010 18:19:21 +0000 Message-Id: <1291313961-10692-1-git-send-email-kilroyd@googlemail.com> X-Mailer: git-send-email 1.7.2.2 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 02 Dec 2010 18:19:37 +0000 (UTC) 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