From 6660efc7d8199c926a3d6c607b8d3ab5fbd787a4 Mon Sep 17 00:00:00 2001 From: David Kilroy Date: Sun, 5 Dec 2010 15:45:58 +0000 Subject: [PATCH] --- yaml --- r: 223241 b: refs/heads/master c: ba34fcee476d11e7c9df95932787a22a96ff6e68 h: refs/heads/master i: 223239: ffe05e65a5c81763955108e4e529fd04380d7485 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/orinoco/main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7da09c6b99ac..8b095fd1cfdd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e2447075690860e2cea96b119fc9cadbaa7e83c +refs/heads/master: ba34fcee476d11e7c9df95932787a22a96ff6e68 diff --git a/trunk/drivers/net/wireless/orinoco/main.c b/trunk/drivers/net/wireless/orinoco/main.c index fa0cf744958f..f3d396e7544b 100644 --- a/trunk/drivers/net/wireless/orinoco/main.c +++ b/trunk/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 */