Return-path: 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) 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> In-Reply-To: References: Sender: linux-wireless-owner@vger.kernel.org List-ID: ... and interface up. In these situations, you are usually trying to connect to a new AP, so keeping TKIP countermeasures active is confusing. This is already how the driver behaves (inadvertently). However, querying SIOCGIWAUTH may tell userspace that countermeasures are active when they aren't. Clear the setting so that the reporting matches what the driver has done.. Signed-off by: David Kilroy --- drivers/net/wireless/orinoco/main.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) 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 */ -- 1.7.2.2