summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-03-29 15:59:01 +0100
committerJohn W. Linville <linville@tuxdriver.com>2008-04-01 17:13:20 -0400
commitbc5213f468b4d0520a06e27ea2cc9724bc5b896c (patch)
tree81f89a67d630dd5941db986f1363df068997eaf4
parente5472978ef16051337913f57b2f22982f3e9e4c2 (diff)
downloadop-kernel-dev-bc5213f468b4d0520a06e27ea2cc9724bc5b896c.zip
op-kernel-dev-bc5213f468b4d0520a06e27ea2cc9724bc5b896c.tar.gz
rt2x00: Invert scheduled packet_filter check
Invert the check for scheduling the packet_filter configuration. When DRIVER_REQUIRE_SCHEDULED is not set we should immediately configure the the filter. This fixes the 'infinite calls to rt2x00mc_configure_filter' bug reported by Bas Hulsken. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00mac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 17b6bb0..a0adf5a 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -418,9 +418,9 @@ void rt2x00mac_configure_filter(struct ieee80211_hw *hw,
rt2x00dev->packet_filter = *total_flags;
if (!test_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags))
- queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->filter_work);
- else
rt2x00dev->ops->lib->config_filter(rt2x00dev, *total_flags);
+ else
+ queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->filter_work);
}
EXPORT_SYMBOL_GPL(rt2x00mac_configure_filter);
OpenPOWER on IntegriCloud