From patchwork Sat Dec 4 19:42:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave X-Patchwork-Id: 380351 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 oB531me9006973 for ; Sun, 5 Dec 2010 03:01:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755646Ab0LDTnE (ORCPT ); Sat, 4 Dec 2010 14:43:04 -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 S1755616Ab0LDTnC (ORCPT ); Sat, 4 Dec 2010 14:43:02 -0500 Received: by mail-wy0-f174.google.com with SMTP id 28so10672961wyb.19 for ; Sat, 04 Dec 2010 11:43:02 -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=85Obl+69JMjb2mJgX6ZaihbMR/LuXdkuXT3pqHZ/5pc=; b=sVU7T4OHvstMptSPv5UROJsc02AoXzQbnJOIhzHybcUyhvd26L3Tr5F/xN4i49WKlQ RjWC+fMt5iRM3EZwmknS+55JiNUzFMDak4oBrShbwACHEEHzypIUIWZofQg+Mz8aFXJL I7rd1hpeln2OLjd3LxgFjdi22gzv+leC7vYwE= 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=dDRDDbexnqDB7u62FPse1SPl+IUhXdy+g60L8wQN6fMm9STqLSBKk5T2EvEjs+7BOt GpS52G3Ka5OubdVWFDgxMVAU9aRkueAZPzN7k2NZzO2T93jkNZP6OOcVrvSaQyxkljTT OW4qfsBkn7vAxbCNBpcYV6fsn1sEmjeZbAS3g= Received: by 10.216.179.193 with SMTP id h43mr787519wem.49.1291491781942; Sat, 04 Dec 2010 11:43:01 -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.43.00 (version=SSLv3 cipher=RC4-MD5); Sat, 04 Dec 2010 11:43:01 -0800 (PST) From: David Kilroy To: linux-wireless@vger.kernel.org Cc: comes@naic.edu, David Kilroy Subject: [PATCH 2/2] orinoco: clear countermeasure setting on commit Date: Sat, 4 Dec 2010 19:42:44 +0000 Message-Id: <1291491764-6655-2-git-send-email-kilroyd@googlemail.com> X-Mailer: git-send-email 1.7.2.2 In-Reply-To: <1291491764-6655-1-git-send-email-kilroyd@googlemail.com> References: <1291491764-6655-1-git-send-email-kilroyd@googlemail.com> 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/main.c b/drivers/net/wireless/orinoco/main.c index fa0cf74..f3d396e 100644 --- a/drivers/net/wireless/orinoco/main.c +++ b/drivers/net/wireless/orinoco/main.c @@ -1811,6 +1811,12 @@ static int __orinoco_commit(struct orinoco_private *priv) struct net_device *dev = priv->ndev; int err = 0; + /* If we've called commit, we are reconfiguring or bringing the + * interface up. Maintaining countermeasures across this would + * be confusing, so note that we've disabled them. The port will + * be enabled later in orinoco_commit or __orinoco_up. */ + priv->tkip_cm_active = 0; + err = orinoco_hw_program_rids(priv); /* FIXME: what about netif_tx_lock */