From 427da95a7a8d2c1919d02b167a15b9d11072e78c Mon Sep 17 00:00:00 2001 From: "Padma, Santhosh Kumar" Date: Wed, 1 Jul 2015 15:07:59 +0530 Subject: Revert "qcacld-2.0: Mark wmmAcAccessAllowed as True if implicit Qos is disabled" This reverts change If7100f0fedeaf3acba0be81ec95d0d5ab6a80d82. Change If7100f0fedeaf3acba0be81ec95d0d5ab6a80d82 marks wmmAcAccessAllowed as true if implicit Qos is disabled. This causes data to be tagged as VO without Tspec negotiation. So, revert this change. Change-Id: Ib257e44672dc1553c8b9a9250a1b52311f5b2d36 CRs-Fixed: 864625 --- CORE/HDD/src/wlan_hdd_wmm.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/CORE/HDD/src/wlan_hdd_wmm.c b/CORE/HDD/src/wlan_hdd_wmm.c index 6400cf9d7bb5..46370690dc04 100644 --- a/CORE/HDD/src/wlan_hdd_wmm.c +++ b/CORE/HDD/src/wlan_hdd_wmm.c @@ -2296,16 +2296,7 @@ VOS_STATUS hdd_wmm_connect( hdd_adapter_t* pAdapter, // admission is required pAdapter->hddWmmStatus.wmmAcStatus[ac].wmmAcAccessRequired = VOS_TRUE; - /* - * Mark wmmAcAccessAllowed as True if implicit Qos is disabled as there - * is no need to hold packets in queue during hdd_tx_fetch_packet_cbk - */ - if (!(WLAN_HDD_GET_CTX(pAdapter))->cfg_ini->bImplicitQosEnabled) - pAdapter->hddWmmStatus.wmmAcStatus[ac].wmmAcAccessAllowed = - VOS_TRUE; - else - pAdapter->hddWmmStatus.wmmAcStatus[ac].wmmAcAccessAllowed = - VOS_FALSE; + pAdapter->hddWmmStatus.wmmAcStatus[ac].wmmAcAccessAllowed = VOS_FALSE; pAdapter->hddWmmStatus.wmmAcStatus[ac].wmmAcAccessGranted = VOS_FALSE; //after reassoc if we have valid tspec, allow access if (pAdapter->hddWmmStatus.wmmAcStatus[ac].wmmAcTspecValid && -- cgit v1.2.3