From patchwork Wed Jan 13 15:00:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Cooper X-Patchwork-Id: 8026291 X-Patchwork-Delegate: kvalo@adurom.com 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7C4549F96D for ; Wed, 13 Jan 2016 15:00:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5C19220256 for ; Wed, 13 Jan 2016 15:00:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F2D32051D for ; Wed, 13 Jan 2016 15:00:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755106AbcAMPA0 (ORCPT ); Wed, 13 Jan 2016 10:00:26 -0500 Received: from mout.gmx.net ([212.227.17.21]:49629 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754276AbcAMPAY (ORCPT ); Wed, 13 Jan 2016 10:00:24 -0500 Received: from dc7700.localdomain ([168.235.78.26]) by mail.gmx.com (mrgmx102) with ESMTPSA (Nemesis) id 0LpPg1-1Zf64u2a4T-00f7KC; Wed, 13 Jan 2016 16:00:22 +0100 From: Eli Cooper To: linux-wireless@vger.kernel.org Cc: eli.cooper@gmx.com Subject: [PATCH 1/1] rt2x00: fix monitor mode regression Date: Wed, 13 Jan 2016 23:00:01 +0800 Message-Id: <1452697201-11206-2-git-send-email-elicooper@gmx.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1452697201-11206-1-git-send-email-elicooper@gmx.com> References: <1452697201-11206-1-git-send-email-elicooper@gmx.com> X-Provags-ID: V03:K0:TBi8zlq3DMwOz81FUFVzgoA/1SsaztVdEb5noo+TO+q2YxkriCo P5jYXZ/IQ4fON153G8DGtGyrMWJ+O7tNM6cXhOJ/rOBSjmiKkt7fEBbpj+hbN42BlQsGWyF dhskjDg7xdfESSfGQjRB3SvkA8THynRP4c+2tFMyn1Hm+vOLa05LRylZkYQ8Lrx5SOBoIm5 bDTBo+b6HHa2kEBCV1Syw== X-UI-Out-Filterresults: notjunk:1; V01:K0:7k9LSLwvj1o=:u/yyUsOV4P+KVuhAqt9cY6 EUIJkCLENsbRZKwGGDRSLg71eXO/s4jlKbEv3PHbmVMKuBxCE3gryAqX4uyS9IP1haU+rV1Uq UUl3mE4s5AvbhENNXFLB/4/JeXFJKEtWEuUqW352zmc29TTdQ0o+Dp1WLBNfe108ahRX8mF9e lnLuTNhdDmypwRkwmCOI+VlINC63zE/k3ldy2AIwkKVeO759qRI2hFA3k6WPipuICgSUGaoxJ oTMQwU7r3U4z7AdF4jP6XWPup3UwMTjrJZCIF3r95l8TfnjDfRwE9V/B4KSyxM9wPO/GK14ga hXJZBQUTvLQBjPQfk0zEuF22CxzkMJAR8emUQSGaZF4KJtIlbXofCUI5juMxZQx/qk44lpDTV 28dUI4IV/VOYK59bKyuRShEAWqypTePjFCCegnLKEN1/GirsJtNwWyANvez7NDNVYQUI92t5u YQRarX/viRwiUijAgk9sq/FtpGfY2LOpsY2JWbXPs7kL+95JgSG6NT4LHZo0h51jCEPwrQt+v DUhGDLxEkck79Ba5fg8UFIoyCw8f+CbhZ/vXaSHqCMSNhYpD0NcG8Jj2r2FwEP1PPY0Pxhan6 7F7h1xQbLEwEPd9ZJFcQ1cgwi3uVVXdyVxc7dirRzDtELEW3hMXR4bR0Ki9+7OZXrU2TC3TBX dycQ4UN8FzhSCqV11iE+TJHry9I7mCeGorJvLSvPQBt2lU4+azG3YnBZCCvdUPbu1Uw8gm9Ri p/jeFqcNOvP9Cos7NQi6yGNk9isuJrG28H7n/p/DZv6YudxYV/IwRy8HzHw= Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, 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 --- drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 4 +++- drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 4 +++- drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 4 +++- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 3 ++- drivers/net/wireless/ralink/rt2x00/rt2x00.h | 2 ++ drivers/net/wireless/ralink/rt2x00/rt2x00config.c | 10 ++++++++++ drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 1 + drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 5 ----- drivers/net/wireless/ralink/rt2x00/rt61pci.c | 4 +++- drivers/net/wireless/ralink/rt2x00/rt73usb.c | 4 +++- 10 files changed, 30 insertions(+), 11 deletions(-) diff --git a/drivers/net/wireless/ralink/rt2x00/rt2400pci.c b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c index 9a3966c..578b8a4 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2400pci.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c @@ -273,8 +273,10 @@ static void rt2400pci_config_filter(struct rt2x00_dev *rt2x00dev, !(filter_flags & FIF_PLCPFAIL)); rt2x00_set_field32(®, RXCSR0_DROP_CONTROL, !(filter_flags & FIF_CONTROL)); - rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME, 1); + rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME, + !rt2x00dev->is_monitoring); rt2x00_set_field32(®, RXCSR0_DROP_TODS, + !rt2x00dev->is_monitoring && !rt2x00dev->intf_ap_count); rt2x00_set_field32(®, RXCSR0_DROP_VERSION_ERROR, 1); rt2x00mmio_register_write(rt2x00dev, RXCSR0, reg); diff --git a/drivers/net/wireless/ralink/rt2x00/rt2500pci.c b/drivers/net/wireless/ralink/rt2x00/rt2500pci.c index 1a6740b..9aec12e 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2500pci.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2500pci.c @@ -274,8 +274,10 @@ static void rt2500pci_config_filter(struct rt2x00_dev *rt2x00dev, !(filter_flags & FIF_PLCPFAIL)); rt2x00_set_field32(®, RXCSR0_DROP_CONTROL, !(filter_flags & FIF_CONTROL)); - rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME, 1); + rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME, + !rt2x00dev->is_monitoring); rt2x00_set_field32(®, RXCSR0_DROP_TODS, + !rt2x00dev->is_monitoring && !rt2x00dev->intf_ap_count); rt2x00_set_field32(®, RXCSR0_DROP_VERSION_ERROR, 1); rt2x00_set_field32(®, RXCSR0_DROP_MCAST, diff --git a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c index d26018f..d66364e 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c @@ -437,8 +437,10 @@ static void rt2500usb_config_filter(struct rt2x00_dev *rt2x00dev, !(filter_flags & FIF_PLCPFAIL)); rt2x00_set_field16(®, TXRX_CSR2_DROP_CONTROL, !(filter_flags & FIF_CONTROL)); - rt2x00_set_field16(®, TXRX_CSR2_DROP_NOT_TO_ME, 1); + rt2x00_set_field16(®, TXRX_CSR2_DROP_NOT_TO_ME, + !rt2x00dev->is_monitoring); rt2x00_set_field16(®, TXRX_CSR2_DROP_TODS, + !rt2x00dev->is_monitoring && !rt2x00dev->intf_ap_count); rt2x00_set_field16(®, TXRX_CSR2_DROP_VERSION_ERROR, 1); rt2x00_set_field16(®, TXRX_CSR2_DROP_MULTICAST, diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c index 9733b31..ee8215a 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c @@ -1490,7 +1490,8 @@ void rt2800_config_filter(struct rt2x00_dev *rt2x00dev, !(filter_flags & FIF_FCSFAIL)); rt2x00_set_field32(®, RX_FILTER_CFG_DROP_PHY_ERROR, !(filter_flags & FIF_PLCPFAIL)); - rt2x00_set_field32(®, RX_FILTER_CFG_DROP_NOT_TO_ME, 1); + rt2x00_set_field32(®, RX_FILTER_CFG_DROP_NOT_TO_ME, + !rt2x00dev->is_monitoring); rt2x00_set_field32(®, RX_FILTER_CFG_DROP_NOT_MY_BSSD, 0); rt2x00_set_field32(®, RX_FILTER_CFG_DROP_VER_ERROR, 1); rt2x00_set_field32(®, RX_FILTER_CFG_DROP_MULTICAST, diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h index 3282ddb..a2e70ec 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h @@ -844,11 +844,13 @@ struct rt2x00_dev { * - Open sta interface count. * - Association count. * - Beaconing enabled count. + * - Whether the device is monitoring. */ unsigned int intf_ap_count; unsigned int intf_sta_count; unsigned int intf_associated; unsigned int intf_beaconing; + bool is_monitoring; /* * Interface combinations diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00config.c b/drivers/net/wireless/ralink/rt2x00/rt2x00config.c index 7e8bb11..3b531f0 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00config.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00config.c @@ -244,6 +244,16 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, (ieee80211_flags & IEEE80211_CONF_CHANGE_PS)) cancel_delayed_work_sync(&rt2x00dev->autowakeup_work); + if (ieee80211_flags & IEEE80211_CONF_CHANGE_MONITOR) { + if (conf->flags & IEEE80211_CONF_MONITOR) { + rt2x00_dbg(rt2x00dev, "Monitor mode is enabled\n"); + rt2x00dev->is_monitoring = true; + } else { + rt2x00_dbg(rt2x00dev, "Monitor mode is disabled\n"); + rt2x00dev->is_monitoring = false; + } + } + /* * Start configuration. */ diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c index 5639ed8..e979dca 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c @@ -1204,6 +1204,7 @@ int rt2x00lib_start(struct rt2x00_dev *rt2x00dev) rt2x00dev->intf_ap_count = 0; rt2x00dev->intf_sta_count = 0; rt2x00dev->intf_associated = 0; + rt2x00dev->is_monitoring = false; /* Enable the radio */ retval = rt2x00lib_enable_radio(rt2x00dev); diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c b/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c index 3c26ee6..13da95a 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c @@ -385,11 +385,6 @@ void rt2x00mac_configure_filter(struct ieee80211_hw *hw, *total_flags |= FIF_PSPOLL; } - /* - * Check if there is any work left for us. - */ - if (rt2x00dev->packet_filter == *total_flags) - return; rt2x00dev->packet_filter = *total_flags; rt2x00dev->ops->lib->config_filter(rt2x00dev, *total_flags); diff --git a/drivers/net/wireless/ralink/rt2x00/rt61pci.c b/drivers/net/wireless/ralink/rt2x00/rt61pci.c index c0e730e..b875a0f 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt61pci.c +++ b/drivers/net/wireless/ralink/rt2x00/rt61pci.c @@ -530,8 +530,10 @@ static void rt61pci_config_filter(struct rt2x00_dev *rt2x00dev, !(filter_flags & FIF_PLCPFAIL)); rt2x00_set_field32(®, TXRX_CSR0_DROP_CONTROL, !(filter_flags & (FIF_CONTROL | FIF_PSPOLL))); - rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME, 1); + rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME, + !rt2x00dev->is_monitoring); rt2x00_set_field32(®, TXRX_CSR0_DROP_TO_DS, + !rt2x00dev->is_monitoring && !rt2x00dev->intf_ap_count); rt2x00_set_field32(®, TXRX_CSR0_DROP_VERSION_ERROR, 1); rt2x00_set_field32(®, TXRX_CSR0_DROP_MULTICAST, diff --git a/drivers/net/wireless/ralink/rt2x00/rt73usb.c b/drivers/net/wireless/ralink/rt2x00/rt73usb.c index 7081e13..6e8e620 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt73usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt73usb.c @@ -480,8 +480,10 @@ static void rt73usb_config_filter(struct rt2x00_dev *rt2x00dev, !(filter_flags & FIF_PLCPFAIL)); rt2x00_set_field32(®, TXRX_CSR0_DROP_CONTROL, !(filter_flags & (FIF_CONTROL | FIF_PSPOLL))); - rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME, 1); + rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME, + !rt2x00dev->is_monitoring); rt2x00_set_field32(®, TXRX_CSR0_DROP_TO_DS, + !rt2x00dev->is_monitoring && !rt2x00dev->intf_ap_count); rt2x00_set_field32(®, TXRX_CSR0_DROP_VERSION_ERROR, 1); rt2x00_set_field32(®, TXRX_CSR0_DROP_MULTICAST,