--- drivers/net/wireless/orinoco/main.c

+++ drivers/net/wireless/orinoco/main.c

@@ -1767,6 +1767,12 @@ static int __orinoco_commit(struct orino

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 */