diff -r 000000000000 -r c40eb8fe8501 wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_operation_set_uapsd_settings.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_operation_set_uapsd_settings.cpp	Tue Feb 02 02:03:13 2010 +0200
@@ -0,0 +1,101 @@
+/*
+* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Statemachine for setting U-APSD settings.
+*
+*/
+
+
+#include "core_operation_set_uapsd_settings.h"
+#include "core_server.h"
+#include "am_debug.h"
+
+// ======== MEMBER FUNCTIONS ========
+
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+//
+core_operation_set_uapsd_settings_c::core_operation_set_uapsd_settings_c(
+    u32_t request_id,
+    core_server_c* server,
+    abs_core_driverif_c* drivers,
+    abs_core_server_callback_c* adaptation,
+    const core_uapsd_settings_s& settings ) :
+    core_operation_base_c( core_operation_set_uapsd_settings, request_id, server, drivers, adaptation,
+        core_base_flag_none ),
+    uapsd_settings_m( settings )
+    {
+    DEBUG( "core_operation_set_uapsd_settings_c::core_operation_set_uapsd_settings_c()" );
+    }
+
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+//
+core_operation_set_uapsd_settings_c::~core_operation_set_uapsd_settings_c()
+    {
+    DEBUG( "core_operation_set_uapsd_settings_c::~core_operation_set_uapsd_settings_c()" );
+    }
+    
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+//
+core_error_e core_operation_set_uapsd_settings_c::next_state()
+    {
+    DEBUG( "core_operation_set_uapsd_settings_c::next_state()" );    
+
+    switch ( operation_state_m )
+        {
+        case core_state_init:
+            {
+            server_m->get_core_settings().set_uapsd_settings(
+                uapsd_settings_m );
+
+            if ( !server_m->get_core_settings().is_connected() )
+                {
+                DEBUG( "core_operation_set_uapsd_settings_c::next_state() - not connected, no reason to set anything" );
+
+                return core_error_ok;
+                }
+
+            operation_state_m = core_state_set_uapsd_settings;
+
+            DEBUG( "core_operation_set_uapsd_settings_c::next_state() - setting U-APSD settings" );            
+            DEBUG1( "core_operation_set_uapsd_settings_c::next_state() - max_service_period: %u",
+                uapsd_settings_m.max_service_period );
+            DEBUG1( "core_operation_set_uapsd_settings_c::next_state() - uapsd_enabled_for_voice: %u",
+                uapsd_settings_m.uapsd_enabled_for_voice );
+            DEBUG1( "core_operation_set_uapsd_settings_c::next_state() - uapsd_enabled_for_video: %u",
+                uapsd_settings_m.uapsd_enabled_for_video );
+            DEBUG1( "core_operation_set_uapsd_settings_c::next_state() - uapsd_enabled_for_best_effort: %u",
+                uapsd_settings_m.uapsd_enabled_for_best_effort );
+            DEBUG1( "core_operation_set_uapsd_settings_c::next_state() - uapsd_enabled_for_background: %u",
+                uapsd_settings_m.uapsd_enabled_for_background );
+
+            drivers_m->set_uapsd_settings(
+                request_id_m,
+                uapsd_settings_m );
+
+            break;
+            }
+        case core_state_set_uapsd_settings:
+            {
+            return core_error_ok;
+            }
+        default:
+            {
+            ASSERT( false_t );
+            }
+        }
+
+    return core_error_request_pending;
+    }