From patchwork Mon Feb 10 11:47:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eliad Peller X-Patchwork-Id: 3618331 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D333D9F2D6 for ; Mon, 10 Feb 2014 11:48:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1886C20138 for ; Mon, 10 Feb 2014 11:48:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 40BE22018E for ; Mon, 10 Feb 2014 11:48:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752740AbaBJLsH (ORCPT ); Mon, 10 Feb 2014 06:48:07 -0500 Received: from mail-we0-f171.google.com ([74.125.82.171]:40177 "EHLO mail-we0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752606AbaBJLsA (ORCPT ); Mon, 10 Feb 2014 06:48:00 -0500 Received: by mail-we0-f171.google.com with SMTP id u56so4167213wes.16 for ; Mon, 10 Feb 2014 03:47:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rmF6/1g5/AUq8U7R7dkblnthLPvDlTJtuJmBsTAMqGo=; b=hI78ZCGr50zeXlpzNGhSeqQCUD3nQC7MCRpDlhNea1OFW87EmXscV0JH6L2I24BH2/ oA0BfipLnldIN1XXlcQ2eey+8XIorr4c4LfjCm//5jUSEjbfsAd4qNxr6B8UnKu1fkjq ehQVT07GSa2DVLFs+6mQUKFasFFPLrEiJrSNsECPIHrD5NKqIi4sEI2ACXIxwlDfkb5z eliAeIDa+lGfz6Ux8HP4pOIK+E7YZWyctVF0INvf8lqqekhvX2eyFxCfYD1/F8r/2S0D +n0Anc7Ma4XArD+/ORcJOiZLM4wobEIPp2aE8ls+w1YMYJYE1R/0oUCqBZIfixPZ7b3M v3mQ== X-Gm-Message-State: ALoCoQmxRJ4uSDin2R+B5Ro8l59Zv0f4IIkRLdunyG7jFzuRDL0V8zObYERdNeJ2JhXag7vuZ0yM X-Received: by 10.180.85.234 with SMTP id k10mr10158649wiz.32.1392032879423; Mon, 10 Feb 2014 03:47:59 -0800 (PST) Received: from muse.amr.corp.intel.com (93-173-177-113.bb.netvision.net.il. [93.173.177.113]) by mx.google.com with ESMTPSA id ju6sm34687484wjc.1.2014.02.10.03.47.57 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Feb 2014 03:47:58 -0800 (PST) From: Eliad Peller To: "John W. Linville" Cc: Subject: [PATCH 11/18] wlcore: don't stop sched_scan on interface removal Date: Mon, 10 Feb 2014 13:47:27 +0200 Message-Id: <1392032854-28126-12-git-send-email-eliad@wizery.com> X-Mailer: git-send-email 1.8.5.2.229.g4448466.dirty In-Reply-To: <1392032854-28126-1-git-send-email-eliad@wizery.com> References: <1392032854-28126-1-git-send-email-eliad@wizery.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Barak Bercovitz Stopping sched scan on interface removal (during recovery) is no longer needed, as sched scanning is automatically restarted by mac80211. Signed-off-by: Barak Bercovitz Signed-off-by: Eliad Peller --- drivers/net/wireless/ti/wlcore/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index 73bf251..bea2938 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -2582,10 +2582,8 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl, ieee80211_scan_completed(wl->hw, true); } - if (wl->sched_vif == wlvif) { - ieee80211_sched_scan_stopped(wl->hw); + if (wl->sched_vif == wlvif) wl->sched_vif = NULL; - } if (wl->roc_vif == vif) { wl->roc_vif = NULL;