diff --git a/[refs] b/[refs]
index c6480fbb1390..8294e1af13e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 439678f8b0fca7aeca06c6581e3679eef618721a
+refs/heads/master: 4e79fada02df6819106a35ed6111ac47500541b2
diff --git a/trunk/net/mac80211/ht.c b/trunk/net/mac80211/ht.c
index e0a396bdf883..0fd9c2a7f242 100644
--- a/trunk/net/mac80211/ht.c
+++ b/trunk/net/mac80211/ht.c
@@ -47,7 +47,9 @@ void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata,
 	int i;
 
 	if (sdata->vif.type != NL80211_IFTYPE_STATION) {
-		WARN_ON_ONCE(sdata->vif.type != NL80211_IFTYPE_STATION);
+		/* AP interfaces call this code when adding new stations,
+		 * so just silently ignore non station interfaces.
+		 */
 		return;
 	}