From 5b54d06ffa28ecc86e03fc97c1cd263b7e9ab4e5 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Wed, 17 Feb 2010 12:00:38 +0100 Subject: [PATCH] Fixed removing pairwise key --- rt2870.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rt2870.c b/rt2870.c index 86f5a0e..31c0bd0 100644 --- a/rt2870.c +++ b/rt2870.c @@ -2784,12 +2784,11 @@ static void rt2870_key_delete_cb(struct rt2870_softc *sc, void *arg) { /* remove pairwise key */ + vapid = 0; wcid = RT2870_AID2WCID(associd); - tmp = rt2870_io_mac_read(sc, RT2870_REG_WCID_ATTR(wcid)); - - tmp &= ~0xf; - tmp |= (RT2870_REG_CIPHER_MODE_NONE << RT2870_REG_CIPHER_MODE_SHIFT); + tmp = ((vapid & RT2870_REG_VAP_MASK) << RT2870_REG_VAP_SHIFT) | + (RT2870_REG_CIPHER_MODE_NONE << RT2870_REG_CIPHER_MODE_SHIFT) | RT2870_REG_PKEY_ENABLE; rt2870_io_mac_write(sc, RT2870_REG_WCID_ATTR(wcid), tmp); } -- 2.11.4.GIT