From patchwork Wed Mar 20 00:50:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 2304971 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id DBAC83FD8C for ; Wed, 20 Mar 2013 00:50:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757710Ab3CTAu4 (ORCPT ); Tue, 19 Mar 2013 20:50:56 -0400 Received: from mail.candelatech.com ([208.74.158.172]:42733 "EHLO ns3.lanforge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757660Ab3CTAu4 (ORCPT ); Tue, 19 Mar 2013 20:50:56 -0400 Received: from localhost.localdomain (firewall.candelatech.com [70.89.124.249]) by ns3.lanforge.com (8.14.2/8.14.2) with ESMTP id r2K0oqPu020617 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 19 Mar 2013 17:50:53 -0700 From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH v3] mac80211: Don't restart sta-timer if not associated. Date: Tue, 19 Mar 2013 17:50:50 -0700 Message-Id: <1363740650-1626-1-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 1.7.3.4 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Ben Greear I found another crash when deleting lots of virtual stations in a congested environment. I think the problem is that the ieee80211_mlme_notify_scan_completed could call ieee80211_restart_sta_timer for a stopped interface that was about to be deleted. With the following patch I am unable to reproduce the crash. Signed-off-by: Ben Greear --- v3: Just check for sdata-is-running once at top of method instead of worrying about if it is associated or not. :100644 100644 aec786d... 74a8c5f... M net/mac80211/mlme.c net/mac80211/mlme.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index aec786d..74a8c5f 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2933,6 +2933,9 @@ static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata) { u32 flags; + if (!ieee80211_sdata_running(sdata)) + return; + if (sdata->vif.type == NL80211_IFTYPE_STATION) { __ieee80211_stop_poll(sdata);