2 files changed, 5 insertions, 7 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 57bdc153952f..7a23b00c6895 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -621,7 +621,6 @@ enum rt2x00_flags {
         /*
          * Driver features
          */
-        DRIVER_SUPPORT_MIXED_INTERFACES,
         DRIVER_REQUIRE_FIRMWARE,
         DRIVER_REQUIRE_BEACON_GUARD,
         DRIVER_REQUIRE_ATIM_QUEUE,
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index e46d406637f7..e078e0ad0d06 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -201,13 +201,12 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
                 return -ENODEV;
 
         /*
-         * When we don't support mixed interfaces (a combination
-         * of sta and ap virtual interfaces) then we can only
-         * add this interface when the rival interface count is 0.
+         * We don't support mixed combinations of sta and ap virtual
+         * interfaces. We can only add this interface when the rival
+         * interface count is 0.
          */
-        if (!test_bit(DRIVER_SUPPORT_MIXED_INTERFACES, &rt2x00dev->flags) &&
-            ((conf->type == IEEE80211_IF_TYPE_AP && rt2x00dev->intf_sta_count) ||
-             (conf->type != IEEE80211_IF_TYPE_AP && rt2x00dev->intf_ap_count)))
+        if ((conf->type == IEEE80211_IF_TYPE_AP && rt2x00dev->intf_sta_count) ||
+            (conf->type != IEEE80211_IF_TYPE_AP && rt2x00dev->intf_ap_count))
                 return -ENOBUFS;
 
         /*