rt2x00: Move packet filter flags

The packet filter flags don't belong in the interface structure
because they are device based instead of interface based.
So move the filter fields out of struct interface and into rt2x00_dev.

Additionally we shouldn't change the filter based on the working
mode, if such a thing is needed than mac80211 should have done that.

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

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 5e4cb3ee2eae..be1fc0aebadc 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -388,11 +388,6 @@ struct interface {
          * BBSID of the AP to associate with.
          */
         u8 bssid[ETH_ALEN];
-
-        /*
-         * Store the packet filter mode for the current interface.
-         */
-        unsigned int filter;
 };
 
 static inline int is_interface_present(struct interface *intf)
@@ -676,6 +671,13 @@ struct rt2x00_dev {
         struct mutex usb_cache_mutex;
 
         /*
+         * Current packet filter configuration for the device.
+         * This contains all currently active FIF_* flags send
+         * to us by mac80211 during configure_filter().
+         */
+        unsigned int packet_filter;
+
+        /*
          * Interface configuration.
          */
         struct interface interface;