From patchwork Tue Oct 15 17:29:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3046741 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 F00F89F2B7 for ; Tue, 15 Oct 2013 17:32:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CA8A22043C for ; Tue, 15 Oct 2013 17:32:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9814320434 for ; Tue, 15 Oct 2013 17:32:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933406Ab3JORc3 (ORCPT ); Tue, 15 Oct 2013 13:32:29 -0400 Received: from mail-pb0-f42.google.com ([209.85.160.42]:42011 "EHLO mail-pb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932555Ab3JORc3 (ORCPT ); Tue, 15 Oct 2013 13:32:29 -0400 Received: by mail-pb0-f42.google.com with SMTP id un15so9118099pbc.29 for ; Tue, 15 Oct 2013 10:32:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oetr0PR4iTpxbzjyxjfi0if2RTXS3w75iaERNBJl75E=; b=KwY0NtvgKe8ZFzEbVHWPyUC4/IxH72f9ig1ktFChyIXe2jNtkYdFfRTSmPzgiYKHDI bs/pA+1Rj2QIztudc3L/WU732QaXDGC6Yq14hErr8t+omjv67NvoSIig2uumLqUHiwAk GN4JpVRcIc97+BBOeSbl8aO2VZjJmL2kv9HoU= 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=oetr0PR4iTpxbzjyxjfi0if2RTXS3w75iaERNBJl75E=; b=cCVxWFB0GLonBcGonCaaXSs+VEr36ezThuV8LVBnt0yDlAP4qI9DOW49KIZ2m3VRqe /cfQQVlWFDVhq0PCurv9+pmJrucKv5AYAEoZdMOcA0HfQnT8dZ+rt2xEShPztWh07tpL OOOgQge4ZdtsA19AD4Tnn/o4XQr7FVId2SbXEOEk+d5xJunRfKkdm+O7evgNzlfQjY4t XPEeHJ8BOvT6PmjoLIm1ugdvtQE7Y4lNxL9jpxMEldvsri0IAlajmtRYqSimaHEUkKsf yRbeds640JJINMnPteJ6VBI61/xFSy8uWT6aBg2H6JO9Bk21BeC6wBcaPeYGZK5MjtRg 6Dbg== X-Gm-Message-State: ALoCoQnjBv4I8tokYtX+c4qzeV0Fgf+k9wWaKj4WOTIfT+TmuLDB20DPWws17GVGfg0oAyQF2RPMDpn+pRpSu6RtVFZNBz2hGVNF17l9nGOchKa15d2bZUA= X-Received: by 10.68.189.163 with SMTP id gj3mr42831425pbc.102.1381858348458; Tue, 15 Oct 2013 10:32:28 -0700 (PDT) Received: from bob.qualcomm.com (i-global252.qualcomm.com. [199.106.103.252]) by mx.google.com with ESMTPSA id qn1sm85828747pbc.34.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 10:32:27 -0700 (PDT) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH 1/7] ath10k: prevent starting monitor without a vdev Date: Tue, 15 Oct 2013 10:29:50 -0700 Message-Id: <1381858196-17000-2-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1381858196-17000-1-git-send-email-michal.kazior@tieto.com> References: <1381858196-17000-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.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.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 This fixes issue with interface bridging. Linux bridging sets promiscuous mode for all interfaces that are in a bridge. This translates to configure_filter() being called in a mac80211 driver. Before the patch operational interface would be started and upped again when promiscuous mode was enabled causing all sorts of strange issues: * no HTT RX happening (i.e. no traffic) * FW crash upon driver reload/unload Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 049eca2..9f26fcf 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -2205,8 +2205,13 @@ static void ath10k_configure_filter(struct ieee80211_hw *hw, *total_flags &= SUPPORTED_FILTERS; ar->filter_flags = *total_flags; + /* Monitor must not be started if it wasn't created first. Promiscuous + * mode may be started on a non-monitor interface - in such case the monitor + * vdev is not created so starting the monitor makes no sense. Since + * ath10k uses no special RX filters (only BSS filter in STA mode) + * there's no need for any special action here. */ if ((ar->filter_flags & FIF_PROMISC_IN_BSS) && - !ar->monitor_enabled) { + !ar->monitor_enabled && ar->monitor_present) { ath10k_dbg(ATH10K_DBG_MAC, "mac monitor %d start\n", ar->monitor_vdev_id); @@ -2214,7 +2219,7 @@ static void ath10k_configure_filter(struct ieee80211_hw *hw, if (ret) ath10k_warn("Unable to start monitor mode\n"); } else if (!(ar->filter_flags & FIF_PROMISC_IN_BSS) && - ar->monitor_enabled) { + ar->monitor_enabled && ar->monitor_present) { ath10k_dbg(ATH10K_DBG_MAC, "mac monitor %d stop\n", ar->monitor_vdev_id);