From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-858731-1516768328-2-16857047934720552491 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516768327; b=SAcngz6HKujvjifjrKNMyT2XrAGUodcrg2G14fmY53jGw63 c07DvD1+Ac3mC2X8VlKx1B7XRjwzmhLq20k2pNSAGEPiNNJJKYwjp2Tnyf+/jLBf +8JaIyKHPhtSZaPkCUFq3fYaQ0XUVaATiOyhZ0nhtOs230SJuMk+jOMtUG3Z5NTV EKZ6FfPZ5vigAQyUCAi5oGtB9F7s2gGLA2cv5DVN3oO2vXcW/zOFA3tBl1CkhyaC S+lW7xneDjPRJ2WPD4rZhEEHHhJkp9d9zqH6v7xB+E9uplkt7EkC3s+CaRB5D/Zq jseIhyw1oKUVRqcQVj2xfvr8bppHaJF9nzNcd/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1516768327; bh=PwMIM0 qNzp51TgaOpFj1RpG+BuWKaeF0KUt3zwAGy3E=; b=h8JAUtH8BnQOJwRchlkOz9 Is0UpH7cX3+xCgH3JLExNc924MzMVzwaI/03fJSZDIXiSa8NkTwqz5FAR3kCMLJm zrtIrXmi8KftTE3nY3Zszs10FuEhdUMWua6pIGdfq/ddbFPiwCHEOEaLI9ADz2A1 fKkUUJR2j6IZNbr0lE36XNZHHqUQbw93SnFctxIYUE+rXfVKVviTDSuNFXlTn6Ol nlMg+qO+8daFtB13vHej8uJIZpVz/mj8+pyWs8a+p3/7VOOD3TkBRy/rbco01OvH p2xMcnkfmKLxY6FAEYGht0NJqZqRCcymrf+veQAXAzw6Ekt+1hwCDj7PlYdFdo+g == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=P9QTbEJK x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=P9QTbEJK x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933147AbeAXETS (ORCPT ); Tue, 23 Jan 2018 23:19:18 -0500 Received: from mail-by2nam03on0132.outbound.protection.outlook.com ([104.47.42.132]:14154 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932408AbeAXETO (ORCPT ); Tue, 23 Jan 2018 23:19:14 -0500 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.9 51/55] iwlwifi: mvm: fix the TX queue hang timeout for MONITOR vif type Thread-Topic: [PATCH AUTOSEL for 4.9 51/55] iwlwifi: mvm: fix the TX queue hang timeout for MONITOR vif type Thread-Index: AQHTlMoIsNh7kaaHBE2cZd7GbUUXOA== Date: Wed, 24 Jan 2018 04:15:56 +0000 Message-ID: <20180124041521.32223-51-alexander.levin@microsoft.com> References: <20180124041521.32223-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041521.32223-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;DM5PR2101MB1032;7:WiCvovXJSo4EVnbcyUS5SyroKv/4wcRhp+i3sYgsuWz317eSrBHNxrJDPqSNXE3CQslRgH+UKM3lGdCV74fROBZo0Nrm5r3kyVWWe0xcPokCL08OD/FRRl3JOTgESM3V0pInrQ780RIkqwl1nlrbZdlbb5bl836o/nd2WjvP8x2XzOclfMnyrJR0sP5bLoluYUmeYoXs+KvXroB+Jo8C9xe+8+TBBWYtvHTHOx2DgC6fnuQngBtzMxVyO1Ceh+cq x-ms-office365-filtering-correlation-id: bbe91076-20fa-44ae-9035-08d562e19f9c 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:DM5PR2101MB1032; x-ms-traffictypediagnostic: DM5PR2101MB1032: 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)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231046)(2400081)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB1032;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1032; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(396003)(39860400002)(376002)(346002)(39380400002)(189003)(199004)(36756003)(478600001)(6506007)(8676002)(14454004)(6512007)(53936002)(5660300001)(26005)(72206003)(4326008)(25786009)(81156014)(81166006)(8936002)(86362001)(10290500003)(68736007)(2906002)(6346003)(99286004)(6666003)(86612001)(76176011)(6436002)(102836004)(7736002)(2950100002)(66066001)(1076002)(10090500001)(54906003)(22452003)(316002)(105586002)(106356001)(5250100002)(305945005)(2501003)(3846002)(3280700002)(97736004)(2900100001)(6486002)(6116002)(110136005)(3660700001)(107886003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1032;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: Uj+0yoIc/e0+HBnNVhZl+Q/Zv85C+NMbuPjPIfZRcEsXbvceYaPyRFqCYDhIhLoyECDBnyyqKytF2aWQDe4dlg== 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: bbe91076-20fa-44ae-9035-08d562e19f9c X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:15:56.4991 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1032 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 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 d04babd99b53..ff5ce1ed03c4 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c @@ -1040,6 +1040,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