aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-07 06:04:34 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-10-31 18:06:00 -0400
commitd73782fdde76554016abf73b46f843b29f520848 (patch)
tree9b57321ce60ba336dfea63501b1d23d21c700817 /net/mac80211/cfg.c
parent3db594380b8452eda4d88b12844077809607caaa (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/cfg.c')
-rw-r--r--net/mac80211/cfg.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 8dc5e46cea68..cf3fd5d60665 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -394,8 +394,7 @@ static int ieee80211_config_beacon(struct ieee80211_sub_if_data *sdata,
394 */ 394 */
395 if (params->interval) { 395 if (params->interval) {
396 sdata->local->hw.conf.beacon_int = params->interval; 396 sdata->local->hw.conf.beacon_int = params->interval;
397 if (ieee80211_hw_config(sdata->local)) 397 ieee80211_hw_config(sdata->local);
398 return -EINVAL;
399 /* 398 /*
400 * We updated some parameter so if below bails out 399 * We updated some parameter so if below bails out
401 * it's not an error. 400 * it's not an error.