Received: by 10.223.176.46 with SMTP id f43csp273114wra; Tue, 23 Jan 2018 20:47:45 -0800 (PST) X-Google-Smtp-Source: AH8x225R4koT9EO0EvY2QeRU74+x5YDqfNj9/shtaizOOoyz5bYAYikt18Sl83ZltV7BL6Tx2og5 X-Received: by 10.99.125.72 with SMTP id m8mr9904025pgn.146.1516769265347; Tue, 23 Jan 2018 20:47:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516769265; cv=none; d=google.com; s=arc-20160816; b=gjV+WIOdQKdZ5cHDasP/9Mh0giV0yI66SMYZXBZpZps+6RBm805QIhryusm62zyalW jNcxgdzLu6lFrzWdAlACctzR/wRytvkypuTG0ioEs0qBYOjtYAmE0njviZ3RCsLca8ei Y6dZzBtbV2Ik6Na+9kF8LoF4l/61BMn25oRdCXccCC+ohkHN79tzdW+h5Wgwg6rgKYzD UqcwudcMPsXFT9Nq9AFUhntB99/k4gckzIimXeX5E75B98WIAjK/5UNUzxO2w0yZXegc 4Vm5A1GPiUGj7X2i1ogc+uLpdR6C08wisJm3B8+tCAijd5HtLhlIdh9S/M+jQqLe1fVn gNVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=s8GGCNZz6h2/g2Vuv9+jSX4qskxRqKC3tTVD9PsxoWM=; b=YrvysI5Ga92xtmDSrPp/5tyF/O93TSAQpTiXUh+QUvokWN1fmKDW4c7snCAqlSgiQa 62mvQgCzh9xZKUuQws7vIBG+ahn9FqqGTnRFCsQsjRbyChNNsI0RaVaxdTZM77AZJfSp MxC6Tn53clLYj3F5ETF6Gu4jHW1pDt8YCqOWDous3RCaGgFvdIjoipZ30q/1jeSNEFcV xwkP2SQY6wTg3n5qrh0pVWP5KrxbrsF8CO4sa6jJ0D5VnsLUDTiyeDNAYt703EFxfMwz zQ+boY1uGMoSwXCHebvIKvaElCBX+JXaxCArtVFQow9QR9f9A3cSQCKyKipJR3LJ5DtC ndxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=eLYg86Ii; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 92-v6si5529963pli.180.2018.01.23.20.47.31; Tue, 23 Jan 2018 20:47:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=eLYg86Ii; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932691AbeAXEql (ORCPT + 99 others); Tue, 23 Jan 2018 23:46:41 -0500 Received: from mail-sn1nam01on0139.outbound.protection.outlook.com ([104.47.32.139]:26809 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932599AbeAXEQl (ORCPT ); Tue, 23 Jan 2018 23:16:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=s8GGCNZz6h2/g2Vuv9+jSX4qskxRqKC3tTVD9PsxoWM=; b=eLYg86IiHvl+n6OoHio4UxKdwN7Cbs12PoQxHtUwHx5KzfFyfxXCZMBrli2/HjV0HDNawzPV5dk64RtsqxAC+ZlwqIZ4AGCURmguMSwi2XRqxOiV73ixvcG86FLoCJ9UjQZtAvxCZSUDfCdxNvY1XMTdWMBUw6WWeaNyNvCONqg= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0727.namprd21.prod.outlook.com (10.167.110.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.464.1; Wed, 24 Jan 2018 04:16:38 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7%2]) with mapi id 15.20.0464.000; Wed, 24 Jan 2018 04:16:38 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Emmanuel Grumbach , Luca Coelho , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 093/100] iwlwifi: mvm: fix the TX queue hang timeout for MONITOR vif type Thread-Topic: [PATCH AUTOSEL for 4.14 093/100] iwlwifi: mvm: fix the TX queue hang timeout for MONITOR vif type Thread-Index: AQHTlMnuTtbbpqJEbkOG+PKKA+HmmQ== Date: Wed, 24 Jan 2018 04:15:14 +0000 Message-ID: <20180124041414.32065-93-alexander.levin@microsoft.com> References: <20180124041414.32065-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041414.32065-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0727;7:1nSbHGkp4SWE20sUWKcPskyASM9XDegSGDxJlJbq8iPDM5ayauR/vxZcGlHfnWrbnY6Sa+AYOXr1ro25gNmwhWecJZI25CYtOZIfuZZrk9L2UcD7WtV531Nu6ioR3aIK9Bmd37u1x3co0dKaFchNjPOZR4p1UZZPseqor4f+zuMgetGDS0sl72Vs7zdrv5Qc/O2CNjvmqyVNivSzwTCTGaHXbSmpPD3FliZHhKa0fmOKDXiglGb0UMKzGtBBsYbg x-ms-office365-filtering-correlation-id: 3ea31637-5b4a-40f2-4bee-08d562e143bc x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB0727; x-ms-traffictypediagnostic: DM5PR2101MB0727: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(3231046)(2400081)(944501161)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041288)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB0727;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0727; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(396003)(366004)(39380400002)(39860400002)(376002)(189003)(199004)(86612001)(6506007)(106356001)(76176011)(6346003)(54906003)(86362001)(2501003)(110136005)(1076002)(7736002)(5250100002)(3660700001)(316002)(26005)(102836004)(2950100002)(6666003)(99286004)(97736004)(22452003)(107886003)(6436002)(53936002)(478600001)(66066001)(14454004)(2900100001)(6512007)(2906002)(5660300001)(8936002)(4326008)(10290500003)(305945005)(10090500001)(68736007)(25786009)(81166006)(72206003)(36756003)(8676002)(81156014)(3846002)(6116002)(3280700002)(105586002)(6486002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0727;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: KKUB+wdOYItuTT2bFR/oTqq9mYmTCcJ3isNw+kY5JziSOrJXkVpMw+cA80fcFG8c0lF6e2AxjL76A3B3H/2vgw== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3ea31637-5b4a-40f2-4bee-08d562e143bc X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:15:14.0180 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0727 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Emmanuel Grumbach [ Upstream commit d1b275ffec459c5ae12b5c7086c84175696e5a9f ] The MONITOR type is missing in the interface type switch. Add it. Signed-off-by: Emmanuel Grumbach Signed-off-by: Luca Coelho Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/w= ireless/intel/iwlwifi/mvm/utils.c index 53e269d54050..0ae7624eac9d 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c @@ -1181,6 +1181,8 @@ unsigned int iwl_mvm_get_wd_timeout(struct iwl_mvm *m= vm, return le32_to_cpu(txq_timer->p2p_go); case NL80211_IFTYPE_P2P_DEVICE: return le32_to_cpu(txq_timer->p2p_device); + case NL80211_IFTYPE_MONITOR: + return default_timeout; default: WARN_ON(1); return mvm->cfg->base_params->wd_timeout; --=20 2.11.0