From: Ivo van Doorn <ivdoorn@gmail.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org, rt2400-devel@lists.sourceforge.net
Subject: [PATCH 01/30] rt2x00: Correctly configure packet filter in monitor mode
Date: Sun, 19 Aug 2007 20:21:12 +0200 [thread overview]
Message-ID: <200708192021.12839.IvDoorn@gmail.com> (raw)
In-Reply-To: <200708192018.30624.IvDoorn@gmail.com>
>From a065c6ce407b30a02777761794e77ee6cfa8663e Mon Sep 17 00:00:00 2001
From: Ivo van Doorn <IvDoorn@gmail.com>
Date: Sat, 18 Aug 2007 12:50:42 +0200
Subject: [PATCH 01/30] rt2x00: Correctly configure packet filter in monitor mode
If there is a non-monitor interface present
the packet should be strict (even if a monitor interface is present!).
When there is only 1 interface present which is in monitor mode
we should start accepting _all_ frames.
This also means there is no special packet filtering in monitor mode,
so don't check for monitor mode in the set_multicast_list handler.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
drivers/net/wireless/rt2400pci.c | 19 +++++++++++++------
drivers/net/wireless/rt2500pci.c | 19 +++++++++++++------
drivers/net/wireless/rt2500usb.c | 19 +++++++++++++------
drivers/net/wireless/rt2x00config.c | 12 ------------
drivers/net/wireless/rt2x00mac.c | 6 ------
drivers/net/wireless/rt61pci.c | 21 ++++++++++++++-------
drivers/net/wireless/rt73usb.c | 21 ++++++++++++++-------
7 files changed, 67 insertions(+), 50 deletions(-)
diff --git a/drivers/net/wireless/rt2400pci.c b/drivers/net/wireless/rt2400pci.c
index 757d749..d97fa31 100644
--- a/drivers/net/wireless/rt2400pci.c
+++ b/drivers/net/wireless/rt2400pci.c
@@ -305,15 +305,22 @@ static void rt2400pci_config_type(struct rt2x00_dev *rt2x00dev, int type)
else
rt2x00_set_field32(®, RXCSR0_DROP_TODS, 0);
- rt2x00_set_field32(®, RXCSR0_DROP_CRC, 1);
- if (is_monitor_present(&rt2x00dev->interface)) {
- rt2x00_set_field32(®, RXCSR0_DROP_PHYSICAL, 0);
- rt2x00_set_field32(®, RXCSR0_DROP_CONTROL, 0);
- rt2x00_set_field32(®, RXCSR0_DROP_VERSION_ERROR, 0);
- } else {
+ /*
+ * If there is a non-monitor interface present
+ * the packet should be strict (even if a monitor interface is present!).
+ * When there is only 1 interface present which is in monitor mode
+ * we should start accepting _all_ frames.
+ */
+ if (is_interface_present(&rt2x00dev->interface)) {
+ rt2x00_set_field32(®, RXCSR0_DROP_CRC, 1);
rt2x00_set_field32(®, RXCSR0_DROP_PHYSICAL, 1);
rt2x00_set_field32(®, RXCSR0_DROP_CONTROL, 1);
rt2x00_set_field32(®, RXCSR0_DROP_VERSION_ERROR, 1);
+ } else if (is_monitor_present(&rt2x00dev->interface)) {
+ rt2x00_set_field32(®, RXCSR0_DROP_CRC, 0);
+ rt2x00_set_field32(®, RXCSR0_DROP_PHYSICAL, 0);
+ rt2x00_set_field32(®, RXCSR0_DROP_CONTROL, 0);
+ rt2x00_set_field32(®, RXCSR0_DROP_VERSION_ERROR, 0);
}
rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);
diff --git a/drivers/net/wireless/rt2500pci.c b/drivers/net/wireless/rt2500pci.c
index dd98aa4..0a0fa22 100644
--- a/drivers/net/wireless/rt2500pci.c
+++ b/drivers/net/wireless/rt2500pci.c
@@ -309,15 +309,22 @@ static void rt2500pci_config_type(struct rt2x00_dev *rt2x00dev, const int type)
else
rt2x00_set_field32(®, RXCSR0_DROP_TODS, 0);
- rt2x00_set_field32(®, RXCSR0_DROP_CRC, 1);
- if (is_monitor_present(&rt2x00dev->interface)) {
- rt2x00_set_field32(®, RXCSR0_DROP_PHYSICAL, 0);
- rt2x00_set_field32(®, RXCSR0_DROP_CONTROL, 0);
- rt2x00_set_field32(®, RXCSR0_DROP_VERSION_ERROR, 0);
- } else {
+ /*
+ * If there is a non-monitor interface present
+ * the packet should be strict (even if a monitor interface is present!).
+ * When there is only 1 interface present which is in monitor mode
+ * we should start accepting _all_ frames.
+ */
+ if (is_interface_present(&rt2x00dev->interface)) {
+ rt2x00_set_field32(®, RXCSR0_DROP_CRC, 1);
rt2x00_set_field32(®, RXCSR0_DROP_PHYSICAL, 1);
rt2x00_set_field32(®, RXCSR0_DROP_CONTROL, 1);
rt2x00_set_field32(®, RXCSR0_DROP_VERSION_ERROR, 1);
+ } else if (is_monitor_present(&rt2x00dev->interface)) {
+ rt2x00_set_field32(®, RXCSR0_DROP_CRC, 0);
+ rt2x00_set_field32(®, RXCSR0_DROP_PHYSICAL, 0);
+ rt2x00_set_field32(®, RXCSR0_DROP_CONTROL, 0);
+ rt2x00_set_field32(®, RXCSR0_DROP_VERSION_ERROR, 0);
}
rt2x00pci_register_write(rt2x00dev, RXCSR0, reg);
diff --git a/drivers/net/wireless/rt2500usb.c b/drivers/net/wireless/rt2500usb.c
index e09fb9f..ad400dd 100644
--- a/drivers/net/wireless/rt2500usb.c
+++ b/drivers/net/wireless/rt2500usb.c
@@ -314,15 +314,22 @@ static void rt2500usb_config_type(struct rt2x00_dev *rt2x00dev, const int type)
else
rt2x00_set_field16(®, TXRX_CSR2_DROP_TODS, 0);
- rt2x00_set_field16(®, TXRX_CSR2_DROP_CRC, 1);
- if (is_monitor_present(&rt2x00dev->interface)) {
- rt2x00_set_field16(®, TXRX_CSR2_DROP_PHYSICAL, 0);
- rt2x00_set_field16(®, TXRX_CSR2_DROP_CONTROL, 0);
- rt2x00_set_field16(®, TXRX_CSR2_DROP_VERSION_ERROR, 0);
- } else {
+ /*
+ * If there is a non-monitor interface present
+ * the packet should be strict (even if a monitor interface is present!).
+ * When there is only 1 interface present which is in monitor mode
+ * we should start accepting _all_ frames.
+ */
+ if (is_interface_present(&rt2x00dev->interface)) {
+ rt2x00_set_field16(®, TXRX_CSR2_DROP_CRC, 1);
rt2x00_set_field16(®, TXRX_CSR2_DROP_PHYSICAL, 1);
rt2x00_set_field16(®, TXRX_CSR2_DROP_CONTROL, 1);
rt2x00_set_field16(®, TXRX_CSR2_DROP_VERSION_ERROR, 1);
+ } else if (is_monitor_present(&rt2x00dev->interface)) {
+ rt2x00_set_field16(®, TXRX_CSR2_DROP_CRC, 0);
+ rt2x00_set_field16(®, TXRX_CSR2_DROP_PHYSICAL, 0);
+ rt2x00_set_field16(®, TXRX_CSR2_DROP_CONTROL, 0);
+ rt2x00_set_field16(®, TXRX_CSR2_DROP_VERSION_ERROR, 0);
}
rt2500usb_register_write(rt2x00dev, TXRX_CSR2, reg);
diff --git a/drivers/net/wireless/rt2x00config.c b/drivers/net/wireless/rt2x00config.c
index 11d5646..4fec0af 100644
--- a/drivers/net/wireless/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00config.c
@@ -48,18 +48,6 @@ void rt2x00lib_config_bssid(struct rt2x00_dev *rt2x00dev, u8 *bssid)
void rt2x00lib_config_packet_filter(struct rt2x00_dev *rt2x00dev, int filter)
{
- struct interface *intf = &rt2x00dev->interface;
-
- /*
- * When a monitor interface is present,
- * we should force enable all modes.
- */
- if (is_monitor_present(intf)) {
- filter = IFF_PROMISC | IFF_MULTICAST | IFF_BROADCAST;
- if (intf->filter != filter)
- __set_bit(PACKET_FILTER_PENDING, &rt2x00dev->flags);
- }
-
/*
* Only configure the device when something has changed,
* or if we are in RESET state in which case all configuration
diff --git a/drivers/net/wireless/rt2x00mac.c b/drivers/net/wireless/rt2x00mac.c
index 205f10f..c384767 100644
--- a/drivers/net/wireless/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00mac.c
@@ -333,12 +333,6 @@ void rt2x00mac_set_multicast_list(struct ieee80211_hw *hw,
rt2x00dev->interface.filter = flags;
/*
- * No filtering in monitor mode.
- */
- if (is_monitor_present(&rt2x00dev->interface))
- return;
-
- /*
* Raise the pending bit to indicate the
* packet filter should be updated.
*/
diff --git a/drivers/net/wireless/rt61pci.c b/drivers/net/wireless/rt61pci.c
index 00f66e0..7f3a00b 100644
--- a/drivers/net/wireless/rt61pci.c
+++ b/drivers/net/wireless/rt61pci.c
@@ -338,17 +338,24 @@ static void rt61pci_config_type(struct rt2x00_dev *rt2x00dev, const int type)
else
rt2x00_set_field32(®, TXRX_CSR0_DROP_TO_DS, 0);
- rt2x00_set_field32(®, TXRX_CSR0_DROP_CRC, 1);
- if (is_monitor_present(&rt2x00dev->interface)) {
- rt2x00_set_field32(®, TXRX_CSR0_DROP_PHYSICAL, 0);
- rt2x00_set_field32(®, TXRX_CSR0_DROP_CONTROL, 0);
- rt2x00_set_field32(®, TXRX_CSR0_DROP_VERSION_ERROR, 0);
- rt2x00_set_field32(®, TXRX_CSR0_DROP_ACK_CTS, 0);
- } else {
+ /*
+ * If there is a non-monitor interface present
+ * the packet should be strict (even if a monitor interface is present!).
+ * When there is only 1 interface present which is in monitor mode
+ * we should start accepting _all_ frames.
+ */
+ if (is_interface_present(&rt2x00dev->interface)) {
+ rt2x00_set_field32(®, TXRX_CSR0_DROP_CRC, 1);
rt2x00_set_field32(®, TXRX_CSR0_DROP_PHYSICAL, 1);
rt2x00_set_field32(®, TXRX_CSR0_DROP_CONTROL, 1);
rt2x00_set_field32(®, TXRX_CSR0_DROP_VERSION_ERROR, 1);
rt2x00_set_field32(®, TXRX_CSR0_DROP_ACK_CTS, 1);
+ } else if (is_monitor_present(&rt2x00dev->interface)) {
+ rt2x00_set_field32(®, TXRX_CSR0_DROP_CRC, 0);
+ rt2x00_set_field32(®, TXRX_CSR0_DROP_PHYSICAL, 0);
+ rt2x00_set_field32(®, TXRX_CSR0_DROP_CONTROL, 0);
+ rt2x00_set_field32(®, TXRX_CSR0_DROP_VERSION_ERROR, 0);
+ rt2x00_set_field32(®, TXRX_CSR0_DROP_ACK_CTS, 0);
}
rt2x00pci_register_write(rt2x00dev, TXRX_CSR0, reg);
diff --git a/drivers/net/wireless/rt73usb.c b/drivers/net/wireless/rt73usb.c
index 2f0bf29..90e2b29 100644
--- a/drivers/net/wireless/rt73usb.c
+++ b/drivers/net/wireless/rt73usb.c
@@ -313,17 +313,24 @@ static void rt73usb_config_type(struct rt2x00_dev *rt2x00dev, const int type)
else
rt2x00_set_field32(®, TXRX_CSR0_DROP_TO_DS, 0);
- rt2x00_set_field32(®, TXRX_CSR0_DROP_CRC, 1);
- if (is_monitor_present(&rt2x00dev->interface)) {
- rt2x00_set_field32(®, TXRX_CSR0_DROP_PHYSICAL, 0);
- rt2x00_set_field32(®, TXRX_CSR0_DROP_CONTROL, 0);
- rt2x00_set_field32(®, TXRX_CSR0_DROP_VERSION_ERROR, 0);
- rt2x00_set_field32(®, TXRX_CSR0_DROP_ACK_CTS, 0);
- } else {
+ /*
+ * If there is a non-monitor interface present
+ * the packet should be strict (even if a monitor interface is present!).
+ * When there is only 1 interface present which is in monitor mode
+ * we should start accepting _all_ frames.
+ */
+ if (is_interface_present(&rt2x00dev->interface)) {
+ rt2x00_set_field32(®, TXRX_CSR0_DROP_CRC, 1);
rt2x00_set_field32(®, TXRX_CSR0_DROP_PHYSICAL, 1);
rt2x00_set_field32(®, TXRX_CSR0_DROP_CONTROL, 1);
rt2x00_set_field32(®, TXRX_CSR0_DROP_VERSION_ERROR, 1);
rt2x00_set_field32(®, TXRX_CSR0_DROP_ACK_CTS, 1);
+ } else if (is_monitor_present(&rt2x00dev->interface)) {
+ rt2x00_set_field32(®, TXRX_CSR0_DROP_CRC, 0);
+ rt2x00_set_field32(®, TXRX_CSR0_DROP_PHYSICAL, 0);
+ rt2x00_set_field32(®, TXRX_CSR0_DROP_CONTROL, 0);
+ rt2x00_set_field32(®, TXRX_CSR0_DROP_VERSION_ERROR, 0);
+ rt2x00_set_field32(®, TXRX_CSR0_DROP_ACK_CTS, 0);
}
rt73usb_register_write(rt2x00dev, TXRX_CSR0, reg);
--
1.5.3.rc5
next prev parent reply other threads:[~2007-08-19 18:30 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-19 18:18 Please pull 'upstream' branch of rt2x00 Ivo van Doorn
2007-08-19 18:21 ` Ivo van Doorn [this message]
2007-08-19 18:21 ` [PATCH 02/30] rt2x00: Clear MAC and BSSID when non-monitor interface goes down Ivo van Doorn
2007-08-19 18:21 ` [PATCH 03/30] rt2x00: Check return value of usb_control_msg() Ivo van Doorn
2007-08-19 18:22 ` [PATCH 04/30] rt2x00: Clear all fields on start_link_tune() Ivo van Doorn
2007-08-19 18:22 ` [PATCH 05/30] rt2x00: Don't increase rx_failed for individual frames Ivo van Doorn
2007-08-19 18:23 ` [PATCH 06/30] rt2x00: Set vgc_level during reset_tuner Ivo van Doorn
2007-08-19 18:23 ` [PATCH 07/30] rt2x00: Schedule beacon update Ivo van Doorn
2007-08-19 18:24 ` [PATCH 08/30] rt2x00: Fix width of filter field Ivo van Doorn
2007-08-19 18:24 ` [PATCH 09/30] rt2x00: Be consistent with unsigned Ivo van Doorn
2007-08-19 18:24 ` [PATCH 10/30] rt2x00: Correctly reset TX/RX success/failed counters Ivo van Doorn
2007-08-19 18:25 ` [PATCH 11/30] rt2x00: Rework RF register handling Ivo van Doorn
2007-08-19 18:25 ` [PATCH 12/30] rt2x00: Store firmware in memory Ivo van Doorn
2007-08-19 18:54 ` Michael Buesch
2007-08-19 20:44 ` Ivo van Doorn
2007-08-19 18:26 ` [PATCH 13/30] rt2x00: rt2x00_ring_free returns invalid length Ivo van Doorn
2007-08-19 18:26 ` [PATCH 14/30] Fix off-by-one error in debugfs helpers Ivo van Doorn
2007-08-19 18:26 ` [PATCH 15/30] rt2x00: Use caching for USB transfers Ivo van Doorn
2007-08-19 18:27 ` [PATCH 16/30] rt2x00: Cleanup set_state for rt61 and rt73 Ivo van Doorn
2007-08-19 18:27 ` [PATCH 17/30] rt2x00: Fix register initialization ordering Ivo van Doorn
2007-08-19 18:27 ` [PATCH 18/30] rt2x00: memset descriptor before use Ivo van Doorn
2007-08-19 18:28 ` [PATCH 19/30] rt2x00: Remove IEEE80211_HW_WEP_INCLUDE_IV flag Ivo van Doorn
2007-08-19 18:28 ` [PATCH 20/30] rt2x00: Cleanup TXD flags Ivo van Doorn
2007-08-19 18:28 ` [PATCH 21/30] rt2x00: Add byte-ordering annotation for MAC and BSSID Ivo van Doorn
2007-08-19 18:29 ` [PATCH 22/30] rt2x00: Correctly set TXD retry flag Ivo van Doorn
2007-08-19 18:35 ` [PATCH 23/30] rt2x00: Move rt2x00 files into rt2x00 folder Ivo van Doorn
2007-08-19 18:35 ` [PATCH 24/30] rt2x00: Add file pattern to MAINTAINER entry Ivo van Doorn
2007-08-19 18:35 ` [PATCH 25/30] rt2x00: Fix PLCP setup Ivo van Doorn
2007-08-19 18:36 ` [PATCH 26/30] rt2x00: Clean up RATEMASK handling Ivo van Doorn
2007-08-19 18:36 ` [PATCH 27/30] rt2x00: Add rt2x00lib_reset_link_tuner() Ivo van Doorn
2007-08-19 18:36 ` [PATCH 28/30] rt2x00: Always check if mac80211 requested TX status update Ivo van Doorn
2007-08-20 17:21 ` Johannes Berg
2007-08-21 10:21 ` Ivo van Doorn
2007-08-19 18:36 ` [PATCH 29/30] rt2x00: Lindent Ivo van Doorn
2007-08-19 18:37 ` [PATCH 30/30] rt2x00: rt2x00 2.0.7 Ivo van Doorn
2007-08-23 20:55 ` [Rt2400-devel] Please pull 'upstream' branch of rt2x00 John W. Linville
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200708192021.12839.IvDoorn@gmail.com \
--to=ivdoorn@gmail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=rt2400-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.