From 038c2085d0c33477936c778be405b278f8c73a29 Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar@gmail.com>
Date: Fri, 12 Feb 2010 22:21:54 +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 cf51a21..5e4a85f 100644
--- a/rt2860.c
+++ b/rt2860.c
@@ -2258,12 +2258,11 @@ static int rt2860_vap_key_delete(struct ieee80211vap *vap,
 	{
 		/* 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