Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932399AbdDPKzw (ORCPT ); Sun, 16 Apr 2017 06:55:52 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:59688 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932328AbdDPKzk (ORCPT ); Sun, 16 Apr 2017 06:55:40 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matt Chen , Johannes Berg Subject: [PATCH 3.18 077/145] mac80211: flush delayed work when entering suspend Date: Sun, 16 Apr 2017 12:49:30 +0200 Message-Id: <20170416080204.689941033@linuxfoundation.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170416080200.205458595@linuxfoundation.org> References: <20170416080200.205458595@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1043 Lines: 38 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matt Chen commit a9e9200d8661c1a0be8c39f93deb383dc940de35 upstream. The issue was found when entering suspend and resume. It triggers a warning in: mac80211/key.c: ieee80211_enable_keys() ... WARN_ON_ONCE(sdata->crypto_tx_tailroom_needed_cnt || sdata->crypto_tx_tailroom_pending_dec); ... It points out sdata->crypto_tx_tailroom_pending_dec isn't cleaned up successfully in a delayed_work during suspend. Add a flush_delayed_work to fix it. Signed-off-by: Matt Chen Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/mac80211/pm.c | 1 + 1 file changed, 1 insertion(+) --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c @@ -116,6 +116,7 @@ int __ieee80211_suspend(struct ieee80211 break; } + flush_delayed_work(&sdata->dec_tailroom_needed_wk); drv_remove_interface(local, sdata); }