diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-07 06:04:34 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 18:06:00 -0400 |
commit | d73782fdde76554016abf73b46f843b29f520848 (patch) | |
tree | 9b57321ce60ba336dfea63501b1d23d21c700817 /net/mac80211/main.c | |
parent | 3db594380b8452eda4d88b12844077809607caaa (diff) |
mac80211: clean up ieee80211_hw_config errors
Warn when ieee80211_hw_config returns an error, it shouldn't
happen; remove a number of printks that would happen in such
a case and one printk that is user-triggerable.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r-- | net/mac80211/main.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index ff39d893a113..2ff26d03cd50 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c | |||
@@ -222,8 +222,14 @@ int ieee80211_hw_config(struct ieee80211_local *local) | |||
222 | wiphy_name(local->hw.wiphy), chan->center_freq); | 222 | wiphy_name(local->hw.wiphy), chan->center_freq); |
223 | #endif | 223 | #endif |
224 | 224 | ||
225 | if (local->open_count) | 225 | if (local->open_count) { |
226 | ret = local->ops->config(local_to_hw(local), &local->hw.conf); | 226 | ret = local->ops->config(local_to_hw(local), &local->hw.conf); |
227 | /* | ||
228 | * HW reconfiguration should never fail, the driver has told | ||
229 | * us what it can support so it should live up to that promise. | ||
230 | */ | ||
231 | WARN_ON(ret); | ||
232 | } | ||
227 | 233 | ||
228 | return ret; | 234 | return ret; |
229 | } | 235 | } |