[PATCH] rt2x00: Don't use changed_flags inside configure_packet_filter

We shouldn't use changed_flags when configuring the packet filter,
we work directly with the total_flags which is safe enough since
we already check if something has changed after we applied our
packet filtering flag rules.
Also make sure that when the packet filter is scheduled, the
rt2x00dev->interface.filter is cleared to make sure the drivers
will update the packet filter instead of failing at the check:
*total_flags == rt2x00dev->interface.filter

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index f25475318c9b..1e07c3938cb3 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -276,11 +276,18 @@ static void rt2x00lib_packetfilter_scheduled(struct work_struct *work)
 {
         struct rt2x00_dev *rt2x00dev =
             container_of(work, struct rt2x00_dev, filter_work);
+        unsigned int filter = rt2x00dev->interface.filter;
+
+        /*
+         * Since we had stored the filter inside interface.filter,
+         * we should now clear that field. Otherwise the driver will
+         * assume nothing has changed (*total_flags will be compared
+         * to interface.filter to determine if any action is required).
+         */
+        rt2x00dev->interface.filter = 0;
 
         rt2x00dev->ops->hw->configure_filter(rt2x00dev->hw,
-                                             rt2x00dev->interface.filter,
-                                             &rt2x00dev->interface.filter,
-                                             0, NULL);
+                                             filter, &filter, 0, NULL);
 }
 
 /*