From c61232eb25a8ac888b4a335ebc0f636d77f40a7f Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Tue, 16 Feb 2010 22:49:37 +0100 Subject: [PATCH] Fixed removing pairwise key --- rt2860.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rt2860.c b/rt2860.c index d52639a..7634916 100644 --- a/rt2860.c +++ b/rt2860.c @@ -2289,12 +2289,11 @@ static int rt2860_key_delete(struct ieee80211com *ic, { /* remove pairwise key */ + vapid = 0; wcid = RT2860_AID2WCID(associd); - tmp = rt2860_io_mac_read(sc, RT2860_REG_WCID_ATTR(wcid)); - - tmp &= ~0xf; - tmp |= (RT2860_REG_CIPHER_MODE_NONE << RT2860_REG_CIPHER_MODE_SHIFT); + tmp = ((vapid & RT2860_REG_VAP_MASK) << RT2860_REG_VAP_SHIFT) | + (RT2860_REG_CIPHER_MODE_NONE << RT2860_REG_CIPHER_MODE_SHIFT) | RT2860_REG_PKEY_ENABLE; rt2860_io_mac_write(sc, RT2860_REG_WCID_ATTR(wcid), tmp); } -- 2.11.4.GIT