From 22cef8346530a83c819456df21794ef17994b8d2 Mon Sep 17 00:00:00 2001
From: Ivo van Doorn <ivdoorn@gmail.com>
Date: Sat, 29 Mar 2008 15:59:01 +0100
Subject: [PATCH] --- yaml --- r: 90495 b: refs/heads/master c:
 bc5213f468b4d0520a06e27ea2cc9724bc5b896c h: refs/heads/master i:   90493:
 6cfcbf73843938168c5787ecdc4e39d79b237645   90491:
 125702b86f195a1bb876f489464860d4d5f69d6f   90487:
 914a43eacfe72a0d7ed3f8b069667e3680c3929f   90479:
 74fe0c07c2cf026fbccd480516c5eb4064af1b3b   90463:
 f53cb9bd77e00e66b3e7e988c1baaf25183a2d40   90431:
 9aa500a01f1565cdb75669cf8eaeda5ef30d61de   90367:
 4fb6a4e9894e0f099fecc066d02f6bd32e574b18 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/rt2x00/rt2x00mac.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d1bd40c389da..c9dcf0833fa7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5472978ef16051337913f57b2f22982f3e9e4c2
+refs/heads/master: bc5213f468b4d0520a06e27ea2cc9724bc5b896c
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00mac.c b/trunk/drivers/net/wireless/rt2x00/rt2x00mac.c
index 17b6bb034ebf..a0adf5a04aa0 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/trunk/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);