From patchwork Sun Dec 5 15:43:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave X-Patchwork-Id: 380951 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 oB5FiW4F018993 for ; Sun, 5 Dec 2010 15:44:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756174Ab0LEPoa (ORCPT ); Sun, 5 Dec 2010 10:44:30 -0500 Received: from mail-ww0-f44.google.com ([74.125.82.44]:54810 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756064Ab0LEPo3 (ORCPT ); Sun, 5 Dec 2010 10:44:29 -0500 Received: by wwa36 with SMTP id 36so11925377wwa.1 for ; Sun, 05 Dec 2010 07:44:28 -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:in-reply-to:references; bh=wAmqsK9+hxYkO2vWTjjMiGtd/vqJekTOTZvVOj1ZVfM=; b=i5TuauBwnHpyXE+EMD9pZoJu+RQJ8gqFcfkScS+HYoeDOi9fIUvEnjB0iBjupMrmAG gGz774qaBn7bI9iB6lplK9NnXix3Q0F0F/AjnWZMijItoer7J+MbdTdkrf7Uj6lAfE5/ zdxjG/egBKa7lSMam2OxO0hq4t/D7UbzQI9T0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=dfQezV8pvioX1L6QC7OxMxDx/PPDOXkX16sm/RkMvUhOt8trCEGip/BKy+2gdWtcLi zKOoXpGLJA0HYFZK75ibt851G9L6ncdbPCpLrD5Y3JvI7+8Y8V7DzbJH7Fb3xTELBqER eQwWbodzZL7TJkSB7pox7HQxVYFdMGHOzLMbE= Received: by 10.216.18.71 with SMTP id k49mr3765029wek.67.1291563868267; Sun, 05 Dec 2010 07:44:28 -0800 (PST) Received: from localhost.localdomain (5e0c75e0.bb.sky.com [94.12.117.224]) by mx.google.com with ESMTPS id x3sm1889167wes.22.2010.12.05.07.44.26 (version=SSLv3 cipher=RC4-MD5); Sun, 05 Dec 2010 07:44:27 -0800 (PST) From: David Kilroy To: linux-wireless@vger.kernel.org Cc: comes@naic.edu, sedat.dilek@googlemail.com, David Kilroy Subject: [PATCH v2 1/2] orinoco: fix TKIP countermeasure behaviour Date: Sun, 5 Dec 2010 15:43:55 +0000 Message-Id: <1291563835-300-1-git-send-email-kilroyd@googlemail.com> X-Mailer: git-send-email 1.7.2.2 In-Reply-To: References: 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]); Sun, 05 Dec 2010 15:44:32 +0000 (UTC) diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c index 519e01e..9caec9f 100644 --- a/drivers/net/wireless/orinoco/wext.c +++ b/drivers/net/wireless/orinoco/wext.c @@ -912,10 +912,10 @@ static int orinoco_ioctl_set_auth(struct net_device *dev, */ if (param->value) { priv->tkip_cm_active = 1; - ret = hermes_enable_port(hw, 0); + ret = hermes_disable_port(hw, 0); } else { priv->tkip_cm_active = 0; - ret = hermes_disable_port(hw, 0); + ret = hermes_enable_port(hw, 0); } break;