From patchwork Sat Dec 4 19:42:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave X-Patchwork-Id: 380341 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 oB531me8006973 for ; Sun, 5 Dec 2010 03:01:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755612Ab0LDTm7 (ORCPT ); Sat, 4 Dec 2010 14:42:59 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:61596 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755472Ab0LDTm6 (ORCPT ); Sat, 4 Dec 2010 14:42:58 -0500 Received: by wyb28 with SMTP id 28so10672961wyb.19 for ; Sat, 04 Dec 2010 11:42:57 -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=SSqZkF9xrKpEn4FvVJColWz4fcBS3YHmzNtZ/I0mOSQ=; b=YhDIKY37TOnd3DYLD5J6t4t2NceyJU9EJWtG801jmzBKMYTBcH/hyaBfvAHZiZg6bD gju39w+R0VkxWNltBxkv9w2ITQSYcZzwVik1b/0nnYSB8PIWL5CMKyT9/rCnsdapxnPL dwXpukKW4yPvGIOheIgCLT/zvTJZ6lGbvsw88= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=SYSH2IuKZoCRVX+/HS5nCsWRH7hKuqIqE//UgFlcXbG2nrFoWz0Q9x0HzAJXAUSHFK L7YWV4JftCeMsXFP/p0aNyVcgfOcFWL2QxevsjQ1LwEJe7d3OJkrtwiUa/Y5bb5d1jdY x95J3SoqKJEjqhpMJQCdKVuKDQ5ANAK0Vr/zA= Received: by 10.216.233.161 with SMTP id p33mr2968383weq.95.1291491777148; Sat, 04 Dec 2010 11:42:57 -0800 (PST) Received: from localhost.localdomain (5e0c75e0.bb.sky.com [94.12.117.224]) by mx.google.com with ESMTPS id x59sm1545440weq.14.2010.12.04.11.42.56 (version=SSLv3 cipher=RC4-MD5); Sat, 04 Dec 2010 11:42:56 -0800 (PST) From: David Kilroy To: linux-wireless@vger.kernel.org Cc: comes@naic.edu, David Kilroy Subject: [PATCH 1/2] orinoco: fix TKIP countermeasure behaviour Date: Sat, 4 Dec 2010 19:42:43 +0000 Message-Id: <1291491764-6655-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]); Sun, 05 Dec 2010 03:01:50 +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;