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/util.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/util.c')
-rw-r--r-- | net/mac80211/util.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index cee4884b9d06..1b605457017e 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c | |||
@@ -638,11 +638,8 @@ int ieee80211_set_freq(struct ieee80211_sub_if_data *sdata, int freqMHz) | |||
638 | 638 | ||
639 | if (chan && !(chan->flags & IEEE80211_CHAN_DISABLED)) { | 639 | if (chan && !(chan->flags & IEEE80211_CHAN_DISABLED)) { |
640 | if (sdata->vif.type == NL80211_IFTYPE_ADHOC && | 640 | if (sdata->vif.type == NL80211_IFTYPE_ADHOC && |
641 | chan->flags & IEEE80211_CHAN_NO_IBSS) { | 641 | chan->flags & IEEE80211_CHAN_NO_IBSS) |
642 | printk(KERN_DEBUG "%s: IBSS not allowed on frequency " | ||
643 | "%d MHz\n", sdata->dev->name, chan->center_freq); | ||
644 | return ret; | 642 | return ret; |
645 | } | ||
646 | local->oper_channel = chan; | 643 | local->oper_channel = chan; |
647 | 644 | ||
648 | if (local->sw_scanning || local->hw_scanning) | 645 | if (local->sw_scanning || local->hw_scanning) |