1 files changed, 3 insertions, 0 deletions

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 6192caadfab9..f4fc540aac17 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -535,6 +535,9 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
         int priv_size, i;
         struct wiphy *wiphy;
 
+        if (WARN_ON(ops->sta_state && (ops->sta_add || ops->sta_remove)))
+                return NULL;
+
         /* Ensure 32-byte alignment of our private data and hw private data.
          * We use the wiphy priv data for both our ieee80211_local and for
          * the driver's private data