From patchwork Sun Dec 5 15:45:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave X-Patchwork-Id: 380961 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 oB5FkCE5019805 for ; Sun, 5 Dec 2010 15:46:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756075Ab0LEPqK (ORCPT ); Sun, 5 Dec 2010 10:46:10 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:48459 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755518Ab0LEPqJ (ORCPT ); Sun, 5 Dec 2010 10:46:09 -0500 Received: by wyb28 with SMTP id 28so11189976wyb.19 for ; Sun, 05 Dec 2010 07:46:08 -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=IhfYuyBr0iR+DHjD9frjZMiFkgEdmEM6qEK/61etqaQ=; b=jjBl+UjDH519hyN5XixfE8XLKU03E2hs9y0H7slOnB72bg0NDGH9XXmbFIbqFyA0x+ f/zgEyBDZ9+yweWhQBqElAofQIDa0DStq1YYLI8nAQLul0XgM6K4ZR/F/VBWayrOqvMH Dp5aXtc/EuGNO9zS+9Uzx5MZYrZzB2okMUd4o= 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=PzmjhEILUNh2YLESbHbwtf9kCgXxfOeOmYtRArJTWBsK4BI8aHwWYl3Rd15+Ufb0nr JZ7BeKjG45p5yYM5sZFburivg06UrI3sB9f8DtgewsobkQAjUOr4sDEbgQ9advW31IBf 1rRKFhOmcCWo56Q19HrgB1Xm0GSgVPrzat+q8= Received: by 10.216.20.133 with SMTP id p5mr1632978wep.95.1291563968218; Sun, 05 Dec 2010 07:46:08 -0800 (PST) Received: from localhost.localdomain (5e0c75e0.bb.sky.com [94.12.117.224]) by mx.google.com with ESMTPS id x15sm1890391weq.7.2010.12.05.07.46.07 (version=SSLv3 cipher=RC4-MD5); Sun, 05 Dec 2010 07:46:07 -0800 (PST) From: David Kilroy To: linux-wireless@vger.kernel.org Cc: comes@naic.edu, sedat.dilek@googlemail.com, David Kilroy Subject: [PATCH v2 2/2] orinoco: clear countermeasure setting on commit Date: Sun, 5 Dec 2010 15:45:58 +0000 Message-Id: <1291563958-375-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:46:12 +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 */