diff -r af3fb27c7511 -r 13838cf40350 wlan_bearer/wlanldd/wlan_common/umac_common/src/UmacContextImpl.cpp
--- a/wlan_bearer/wlanldd/wlan_common/umac_common/src/UmacContextImpl.cpp	Tue May 25 14:40:09 2010 +0300
+++ b/wlan_bearer/wlanldd/wlan_common/umac_common/src/UmacContextImpl.cpp	Mon Jun 21 17:43:00 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 72 %
+* %version: 73 %
 */
 
 #include "config.h"
@@ -104,10 +104,7 @@
 
     os_memset( &iWHASettings, 0, sizeof( iWHASettings ) );
 
-    os_memset( 
-        &iOurBssMembershipFeatureArray, 
-        KUnallocated, 
-        sizeof( iOurBssMembershipFeatureArray ) );
+    ClearBssMembershipFeatureList();
 
     os_memset( 
         &iHtBlockAckConfigure, 
@@ -1770,6 +1767,34 @@
 // 
 // -----------------------------------------------------------------------------
 //
+void WlanContextImpl::RemoveBssMembershipFeature( TUint8 aItem )
+    {
+    TUint8 i ( 0 );
+
+    do
+        {
+        if ( aItem == iOurBssMembershipFeatureArray[i] )
+            {
+            iOurBssMembershipFeatureArray[i] = KUnallocated;
+
+            OsTracePrint( KUmacDetails, (TUint8*)
+                ("UMAC: WlanContextImpl::RemoveBssMembershipFeature: "
+                 "feature %d removed"),
+                aItem );
+
+            break;
+            }
+        else
+            {
+            ++i;
+            }
+        } while ( i != KMaxNumOfWlanFeatures );
+    }
+
+// -----------------------------------------------------------------------------
+// 
+// -----------------------------------------------------------------------------
+//
 TBool WlanContextImpl::BssMembershipFeatureSupported( TUint8 aItem ) const
     {
     TBool supported ( EFalse );