]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
orinoco: clear countermeasure setting on commit
authorDavid Kilroy <kilroyd@googlemail.com>
Sun, 5 Dec 2010 15:45:58 +0000 (15:45 +0000)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 8 Dec 2010 20:23:52 +0000 (15:23 -0500)
... 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 <kilroyd@googlemail.com>
Cc: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/orinoco/main.c

index fa0cf744958fc2f21d1d61f842bd9e2214ba0b7f..f3d396e7544b9d1d0f7848bc1cabb74bce75b8de 100644 (file)
@@ -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 */