mac80211: move U-APSD enablement to vif flags

In order to let drivers have more dynamic U-APSD support,
move the enablement flag to the virtual interface driver
flags. This lets drivers not only set it up differently
for different interfaces, but also enable/disable on the
fly if needed.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 0 insertions, 4 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 6ab99da38db9..d9ce33663c73 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -916,10 +916,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
                 }
         }
 
-        WARN((local->hw.flags & IEEE80211_HW_SUPPORTS_UAPSD)
-             && (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK),
-             "U-APSD not supported with HW_PS_NULLFUNC_STACK\n");
-
         /*
          * Calculate scan IE length -- we need this to alloc
          * memory and to subtract from the driver limit. It