summaryrefslogtreecommitdiffstats
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorJohannes Berg2008-10-07 12:04:34 +0200
committerJohn W. Linville2008-10-31 23:06:00 +0100
commitd73782fdde76554016abf73b46f843b29f520848 (patch)
tree9b57321ce60ba336dfea63501b1d23d21c700817 /net/mac80211/main.c
parentmac80211: remove wiphy_to_hw (diff)
downloadkernel-qcow2-linux-d73782fdde76554016abf73b46f843b29f520848.tar.gz
kernel-qcow2-linux-d73782fdde76554016abf73b46f843b29f520848.tar.xz
kernel-qcow2-linux-d73782fdde76554016abf73b46f843b29f520848.zip
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.c8
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)
wiphy_name(local->hw.wiphy), chan->center_freq);
#endif
- if (local->open_count)
+ if (local->open_count) {
ret = local->ops->config(local_to_hw(local), &local->hw.conf);
+ /*
+ * HW reconfiguration should never fail, the driver has told
+ * us what it can support so it should live up to that promise.
+ */
+ WARN_ON(ret);
+ }
return ret;
}