From patchwork Wed Mar 26 14:03:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 333947 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 487D2140090 for ; Thu, 27 Mar 2014 01:04:22 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1WSoRE-0005VH-E3; Wed, 26 Mar 2014 14:04:16 +0000 Received: from mail-oa0-f48.google.com ([209.85.219.48]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1WSoR5-0005UB-Je for kernel-team@lists.ubuntu.com; Wed, 26 Mar 2014 14:04:07 +0000 Received: by mail-oa0-f48.google.com with SMTP id m1so2598544oag.35 for ; Wed, 26 Mar 2014 07:04:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=1Jrq9GNOv2FgR7Qs3KHTZgnRHvq0uBz0EGZ0AsRpfsY=; b=kpIN4dgHZEQQBMCsknicW8xcrB2o6U1NnvcXn/kwC6KFscwHJsO3wzp77aoK4uF/yx mm4BYEk8i8Qz9gwQRPJGivNaEPqPli/Z1NoUdr0tZeXyivgqO+LDSqn/XLq9K68kIGIj G7HL2WrEMtMw9cAKxlF4Zl0iF/NOsJWlVixyCbDdVn6ezevds9afcKkn4vnsEQj/w0Il RC0u+Ml1yAiVJTFGTVKp0UKxcHtnbm4J19fAdWS5MhzRCqpKD+Ew4LmN9MlRHlT2TKOi hRYFIxUYy5OfNZXKszMSmz0Ndz8NJwfhBGzyWQjUcJTNUEXAcmifn8fxZF0oLBwzjF8I Oxcw== X-Gm-Message-State: ALoCoQl4Kd4+Da8gMoShz04AYnK4Suav5AAi+QC94LSOcoe00bqSp8sreBinnnNzz8qiBiJgtBym X-Received: by 10.182.33.35 with SMTP id o3mr63705190obi.15.1395842646667; Wed, 26 Mar 2014 07:04:06 -0700 (PDT) Received: from localhost (64-126-112-59.dyn.everestkc.net. [64.126.112.59]) by mx.google.com with ESMTPSA id m7sm5328046obo.7.2014.03.26.07.04.05 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 26 Mar 2014 07:04:06 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1][trusty] UBUNTU: SAUCE: iwlwifi: mvm: disable uAPSD due to bugs in the firmware Date: Wed, 26 Mar 2014 09:03:59 -0500 Message-Id: <1395842639-78401-2-git-send-email-seth.forshee@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1395842639-78401-1-git-send-email-seth.forshee@canonical.com> References: <1395842639-78401-1-git-send-email-seth.forshee@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Emmanuel Grumbach The current firmware advertises support for uAPSD, but critical bugs force us to disable the feature. When a fixed firmware will be available, we will be able to re-enable uAPSD. Cc: [3.13+] Signed-off-by: Emmanuel Grumbach (cherry picked from commit a82dda6cd492b8c88952be6f6527f3656f7ac585 git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git) Signed-off-by: Seth Forshee --- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index 8814b1d..9d08564 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -179,7 +179,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) !iwlwifi_mod_params.sw_crypto) hw->flags |= IEEE80211_HW_MFP_CAPABLE; - if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT) { + if (0 && mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT) { hw->flags |= IEEE80211_HW_SUPPORTS_UAPSD; hw->uapsd_queues = IWL_UAPSD_AC_INFO; hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;