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, 2 insertions, 6 deletions

diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index fc36320a5f1..5c78c4cf80a 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2310,7 +2310,6 @@ static void rt61pci_configure_filter(struct ieee80211_hw *hw,
                                      struct dev_addr_list *mc_list)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
-        struct interface *intf = &rt2x00dev->interface;
         u32 reg;
 
         /*
@@ -2329,22 +2328,19 @@ static void rt61pci_configure_filter(struct ieee80211_hw *hw,
          * Apply some rules to the filters:
          * - Some filters imply different filters to be set.
          * - Some things we can't filter out at all.
-         * - Some filters are set based on interface type.
          */
         if (mc_count)
                 *total_flags |= FIF_ALLMULTI;
         if (*total_flags & FIF_OTHER_BSS ||
             *total_flags & FIF_PROMISC_IN_BSS)
                 *total_flags |= FIF_PROMISC_IN_BSS | FIF_OTHER_BSS;
-        if (is_interface_type(intf, IEEE80211_IF_TYPE_AP))
-                *total_flags |= FIF_PROMISC_IN_BSS;
 
         /*
          * Check if there is any work left for us.
          */
-        if (intf->filter == *total_flags)
+        if (rt2x00dev->packet_filter == *total_flags)
                 return;
-        intf->filter = *total_flags;
+        rt2x00dev->packet_filter = *total_flags;
 
         /*
          * Start configuration steps.