1 files changed, 6 insertions, 12 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 4c2702f128f3..29b9d57df1a3 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -1048,21 +1048,15 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
                 }
         }
 
-        /* Enable Extended Key IDs when driver allowed it, or when it
-         * supports neither HW crypto nor A-MPDUs
+        /* Mac80211 and therefore all drivers using SW crypto only
+         * are able to handle PTK rekeys and Extended Key ID.
          */
-        if ((!local->ops->set_key &&
-             !ieee80211_hw_check(hw, AMPDU_AGGREGATION)) ||
-            ieee80211_hw_check(&local->hw, EXT_KEY_ID_NATIVE))
-                wiphy_ext_feature_set(local->hw.wiphy,
-                                      NL80211_EXT_FEATURE_EXT_KEY_ID);
-
-        /* Mac80211 and therefore all cards only using SW crypto are able to
-         * handle PTK rekeys correctly
-         */
-        if (!local->ops->set_key)
+        if (!local->ops->set_key) {
                 wiphy_ext_feature_set(local->hw.wiphy,
                                       NL80211_EXT_FEATURE_CAN_REPLACE_PTK0);
+                wiphy_ext_feature_set(local->hw.wiphy,
+                                      NL80211_EXT_FEATURE_EXT_KEY_ID);
+        }
 
         /*
          * Calculate scan IE length -- we need this to alloc