1 files changed, 3 insertions, 41 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 4ff26c2159bf..98a9e48f8e4a 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -99,7 +99,9 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev,
         return retval;
 }
 
-void rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
+void rt2x00mac_tx(struct ieee80211_hw *hw,
+                  struct ieee80211_tx_control *control,
+                  struct sk_buff *skb)
 {
         struct rt2x00_dev *rt2x00dev = hw->priv;
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
@@ -212,46 +214,6 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
             !test_bit(DEVICE_STATE_STARTED, &rt2x00dev->flags))
                 return -ENODEV;
 
-        switch (vif->type) {
-        case NL80211_IFTYPE_AP:
-                /*
-                 * We don't support mixed combinations of
-                 * sta and ap interfaces.
-                 */
-                if (rt2x00dev->intf_sta_count)
-                        return -ENOBUFS;
-
-                /*
-                 * Check if we exceeded the maximum amount
-                 * of supported interfaces.
-                 */
-                if (rt2x00dev->intf_ap_count >= rt2x00dev->ops->max_ap_intf)
-                        return -ENOBUFS;
-
-                break;
-        case NL80211_IFTYPE_STATION:
-        case NL80211_IFTYPE_ADHOC:
-        case NL80211_IFTYPE_MESH_POINT:
-        case NL80211_IFTYPE_WDS:
-                /*
-                 * We don't support mixed combinations of
-                 * sta and ap interfaces.
-                 */
-                if (rt2x00dev->intf_ap_count)
-                        return -ENOBUFS;
-
-                /*
-                 * Check if we exceeded the maximum amount
-                 * of supported interfaces.
-                 */
-                if (rt2x00dev->intf_sta_count >= rt2x00dev->ops->max_sta_intf)
-                        return -ENOBUFS;
-
-                break;
-        default:
-                return -EINVAL;
-        }
-
         /*
          * Loop through all beacon queues to find a free
          * entry. Since there are as much beacon entries