From patchwork Fri Nov 21 08:16:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Lee X-Patchwork-Id: 412965 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 495521400F1; Fri, 21 Nov 2014 19:16:46 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XrjOT-0001k5-Dq; Fri, 21 Nov 2014 08:16:41 +0000 Received: from mail-pa0-f47.google.com ([209.85.220.47]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XrjOK-0001gl-KG for kernel-team@lists.ubuntu.com; Fri, 21 Nov 2014 08:16:32 +0000 Received: by mail-pa0-f47.google.com with SMTP id kq14so4351516pab.6 for ; Fri, 21 Nov 2014 00:16:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QHu8ALSsTomWDLAabgEY6XVmN76Hf84rQ0GZ0iz32K4=; b=deLnB0VHzHfFRbCScS1bf4q0fTXlsh50JlSDd0zeB9lUiRIp7k/Med+Y/w9Kd0zfgz 5Uqsr5wA1EgXyGg3kjNG75ak5iybWN2x1yvUYnHjIMSx7Eb4wbqfTOvF46bb0QK4y9AY S7q1yzIsxDqVDWumUTVoblCxzYNmcESAueTKQ3WyKmwpT1+GL8E7oFP7MIpju9hsel5o WVTmFkdzkvgt3XXyus14VEpK+/gevT1HehkGMloSkXJ95p+o+CtZiZKU/20D3JwY3HEX XWXJUSVFZsALCt2BHmtzW5BE6zxW7e6jbL5U9ZmVqPC/0gjjkjwp5XFwz/RVohLwO8oc 0k3g== X-Gm-Message-State: ALoCoQld/vqAr8ONEyaqyeJ31YtgtK60x2emmEnnzPj0K8rrJ2nmI9u8FMVO8sZIQo5tNCnDIU2k X-Received: by 10.68.247.5 with SMTP id ya5mr4767704pbc.42.1416557791083; Fri, 21 Nov 2014 00:16:31 -0800 (PST) Received: from localhost ([116.213.191.74]) by mx.google.com with ESMTPSA id my1sm4073749pbc.20.2014.11.21.00.16.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Nov 2014 00:16:30 -0800 (PST) From: Adam Lee To: kernel-team@lists.ubuntu.com Subject: [Trusty][PATCH 3/5] iwlwifi: remove IWL_UCODE_TLV_FLAGS_SCHED_SCAN flag Date: Fri, 21 Nov 2014 16:16:12 +0800 Message-Id: <1416557774-24131-3-git-send-email-adam.lee@canonical.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1416557774-24131-1-git-send-email-adam.lee@canonical.com> References: <20141120165600.GF26124@ubuntu-mba51> <1416557774-24131-1-git-send-email-adam.lee@canonical.com> Cc: Grumbach Emmanuel 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 BugLink: https://bugs.launchpad.net/bugs/1393317 All the supported firmwares have this flag set. Signed-off-by: Emmanuel Grumbach (cherry picked from commit 536a3eee62fa6b59f9e65723527b1e361c087b9e) Signed-off-by: Adam Lee --- drivers/net/wireless/iwlwifi/iwl-fw.h | 2 -- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 13 +++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h index 75db0871..8c25ca2 100644 --- a/drivers/net/wireless/iwlwifi/iwl-fw.h +++ b/drivers/net/wireless/iwlwifi/iwl-fw.h @@ -88,7 +88,6 @@ * connection when going back to D0 * @IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL: new NS offload (small version) * @IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE: new NS offload (large version) - * @IWL_UCODE_TLV_FLAGS_SCHED_SCAN: this uCode image supports scheduled scan. * @IWL_UCODE_TLV_FLAGS_STA_KEY_CMD: new ADD_STA and ADD_STA_KEY command API * @IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD: support device wide power command * containing CAM (Continuous Active Mode) indication. @@ -110,7 +109,6 @@ enum iwl_ucode_tlv_flag { IWL_UCODE_TLV_FLAGS_D3_CONTINUITY_API = BIT(14), IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL = BIT(15), IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE = BIT(16), - IWL_UCODE_TLV_FLAGS_SCHED_SCAN = BIT(17), IWL_UCODE_TLV_FLAGS_STA_KEY_CMD = BIT(19), IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD = BIT(20), IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT = BIT(24), diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index b2a83d8..dcfbb9a 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -246,14 +246,11 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) else hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; - if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_SCHED_SCAN) { - hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; - hw->wiphy->max_sched_scan_ssids = PROBE_OPTION_MAX; - hw->wiphy->max_match_sets = IWL_SCAN_MAX_PROFILES; - /* we create the 802.11 header and zero length SSID IE. */ - hw->wiphy->max_sched_scan_ie_len = - SCAN_OFFLOAD_PROBE_REQ_SIZE - 24 - 2; - } + hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; + hw->wiphy->max_sched_scan_ssids = PROBE_OPTION_MAX; + hw->wiphy->max_match_sets = IWL_SCAN_MAX_PROFILES; + /* we create the 802.11 header and zero length SSID IE. */ + hw->wiphy->max_sched_scan_ie_len = SCAN_OFFLOAD_PROBE_REQ_SIZE - 24 - 2; hw->wiphy->features |= NL80211_FEATURE_P2P_GO_CTWIN | NL80211_FEATURE_P2P_GO_OPPPS;