diff options
| author |   Ben Greear <greearb@candelatech.com> | 2011-12-05 11:15:55 -0800 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2011-12-06 16:07:07 -0500 |
| commit | 4e79fada02df6819106a35ed6111ac47500541b2 (patch) | |
| tree | 17c8c91d240af7bf224cfe37104a1e6f2fe66fc7 /net/mac80211/ht.c | |
| parent | bcma: pci: use fixed windows when possible (diff) | |
| download | linux-dev-4e79fada02df6819106a35ed6111ac47500541b2.tar.xz linux-dev-4e79fada02df6819106a35ed6111ac47500541b2.zip | |
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.c | 4 |
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, 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; } |