From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DA6FC43381 for ; Wed, 20 Mar 2019 17:31:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3219521841 for ; Wed, 20 Mar 2019 17:31:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553103076; bh=9DUOlVMyllaKYKxkjSsdBbm6uKfc/46Tx+3EOdn60js=; h=Subject:To:Cc:From:Date:List-ID:From; b=dzWa5hz/7utLs+s2W9Xjqcht3Qg4BwqSfvPW0EmUNXySySWNt6KTsLlaP4Jcj7jrm dNdB9yKEyL+yEeilKoYAYAEgPapBB3XWWukrOx2H/Wz0cMwKKNShbFWiwR/y9Wt+KJ +TqWk4qSgcu/zf3tfSd8kcGIdrb/4plThmgki16g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726767AbfCTRbP (ORCPT ); Wed, 20 Mar 2019 13:31:15 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:52521 "EHLO out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726644AbfCTRbP (ORCPT ); Wed, 20 Mar 2019 13:31:15 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 5000A2314F; Wed, 20 Mar 2019 13:31:14 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Wed, 20 Mar 2019 13:31:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=EQp7Dz BIQvONx39Vd88vTeEjiFTmM2oqh06s2Ufs4y4=; b=hwvRBV0DOjW8E/zAFWmLnp G66oh6iCvQIrQzW8w2ld+P48cT3RkfyR5Co+TN0U6mx2IXDelwo12yax07s0fo/o ml+ReYW/Wr4SYeXu9jm/vedKZ/bKYSu+TcK4E77ldWUulf5Y43cGOxTARQzz81SF BvnOErHr2Zu7pHMKdMTgETI2g5BLy/m6XEhjfgcirx3D2grakP/5LKrc8f93u2Li mPXL+RcxUC/byiBXUtsR5KDclpoflCSOthQP/pRqnpOKtjlAMALGZs0hzQeRvpBn TPdAT1cA36vSZ38xSj0jiAMg0Ox6N6fMj6iojoTMGLldAkl3F3abHEnY+uDC1ebQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrieeigddutdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecukfhppeekfedrkeeirdekledruddtjeenucfrrghrrghmpehmrghilhhfrhhomh epghhrvghgsehkrhhorghhrdgtohhmnecuvehluhhsthgvrhfuihiivgepud X-ME-Proxy: Received: from localhost (5356596b.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 9DD85E4519; Wed, 20 Mar 2019 13:31:13 -0400 (EDT) Subject: FAILED: patch "[PATCH] mt76: mt76x02: fix beacon timer issue" failed to apply to 5.0-stable tree To: nbd@nbd.name Cc: From: Date: Wed, 20 Mar 2019 18:31:12 +0100 Message-ID: <155310307219885@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.0-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From ed55c9b9c13e3c30ed644a6ace02fd9fd6b70a45 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 24 Feb 2019 11:37:18 +0100 Subject: [PATCH] mt76: mt76x02: fix beacon timer issue When mt76x0 and mt76x2 beacon code was unified, it changed the order in which beacon enable and beacon interval are configured. Configuring beacon enable before beacon interval can in some cases cause problems with the beacon timer, leading to clients not waking up properly from powersave mode. Fix this by changing the order back to interval first, then enable. Fixes: cc726268e4dce ("mt76: move mt76x02_bss_info_changed in mt76x02-lib module") Cc: stable@vger.kernel.org Signed-off-by: Felix Fietkau diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c index 7b9b1956111b..2e899d30e00d 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c @@ -704,9 +704,6 @@ void mt76x02_bss_info_changed(struct ieee80211_hw *hw, if (changed & BSS_CHANGED_BSSID) mt76x02_mac_set_bssid(dev, mvif->idx, info->bssid); - if (changed & BSS_CHANGED_BEACON_ENABLED) - mt76x02_mac_set_beacon_enable(dev, vif, info->enable_beacon); - if (changed & BSS_CHANGED_HT || changed & BSS_CHANGED_ERP_CTS_PROT) mt76x02_mac_set_tx_protection(dev, info->use_cts_prot, info->ht_operation_mode); @@ -719,6 +716,9 @@ void mt76x02_bss_info_changed(struct ieee80211_hw *hw, dev->tbtt_count = 0; } + if (changed & BSS_CHANGED_BEACON_ENABLED) + mt76x02_mac_set_beacon_enable(dev, vif, info->enable_beacon); + if (changed & BSS_CHANGED_ERP_PREAMBLE) mt76x02_mac_set_short_preamble(dev, info->use_short_preamble);