From 4e79fada02df6819106a35ed6111ac47500541b2 Mon Sep 17 00:00:00 2001 From: Ben Greear Date: Mon, 5 Dec 2011 11:15:55 -0800 Subject: mac80211: Remove WARN_ON in apply-ht-override logic. AP interfaces routinely call this logic, so just silently return when this happens instead of splatting the kernel logs. Reported-by: Christian Lamparter Signed-off-by: Ben Greear Signed-off-by: John W. Linville --- net/mac80211/ht.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'net/mac80211/ht.c') diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index e0a396bdf883..0fd9c2a7f242 100644 --- a/net/mac80211/ht.c +++ b/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; } -- cgit v1.2.3-59-g8ed1b