diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-07 12:04:34 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 18:06:00 -0400 |
| commit | d73782fdde76554016abf73b46f843b29f520848 (patch) | |
| tree | 9b57321ce60ba336dfea63501b1d23d21c700817 /net/mac80211/scan.c | |
| parent | 3db594380b8452eda4d88b12844077809607caaa (diff) | |
| download | kernel-crypto-d73782fdde76554016abf73b46f843b29f520848.tar.gz kernel-crypto-d73782fdde76554016abf73b46f843b29f520848.tar.xz kernel-crypto-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/scan.c')
| -rw-r--r-- | net/mac80211/scan.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 416bb41099f..0989b1c062e 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c @@ -448,18 +448,12 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw) if (local->hw_scanning) { local->hw_scanning = false; - if (ieee80211_hw_config(local)) - printk(KERN_DEBUG "%s: failed to restore operational " - "channel after scan\n", wiphy_name(local->hw.wiphy)); - + ieee80211_hw_config(local); goto done; } local->sw_scanning = false; - if (ieee80211_hw_config(local)) - printk(KERN_DEBUG "%s: failed to restore operational " - "channel after scan\n", wiphy_name(local->hw.wiphy)); - + ieee80211_hw_config(local); netif_tx_lock_bh(local->mdev); netif_addr_lock(local->mdev); @@ -546,12 +540,8 @@ void ieee80211_scan_work(struct work_struct *work) if (!skip) { local->scan_channel = chan; - if (ieee80211_hw_config(local)) { - printk(KERN_DEBUG "%s: failed to set freq to " - "%d MHz for scan\n", wiphy_name(local->hw.wiphy), - chan->center_freq); + if (ieee80211_hw_config(local)) skip = 1; - } } /* advance state machine to next channel/band */ |