aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ht.c
diff options
context:
space:
mode:
authorBen Greear <greearb@candelatech.com>2011-12-05 14:15:55 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-12-06 16:07:07 -0500
commit4e79fada02df6819106a35ed6111ac47500541b2 (patch)
tree17c8c91d240af7bf224cfe37104a1e6f2fe66fc7 /net/mac80211/ht.c
parent439678f8b0fca7aeca06c6581e3679eef618721a (diff)
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 <chunkeey@googlemail.com> Signed-off-by: Ben Greear <greearb@candelatech.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ht.c')
-rw-r--r--net/mac80211/ht.c4
1 files changed, 3 insertions, 1 deletions
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,
47 int i; 47 int i;
48 48
49 if (sdata->vif.type != NL80211_IFTYPE_STATION) { 49 if (sdata->vif.type != NL80211_IFTYPE_STATION) {
50 WARN_ON_ONCE(sdata->vif.type != NL80211_IFTYPE_STATION); 50 /* AP interfaces call this code when adding new stations,
51 * so just silently ignore non station interfaces.
52 */
51 return; 53 return;
52 } 54 }
53 55