diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-09 22:17:24 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-09 22:17:24 +0300 |
| commit | f6d773cd4f3c18c40ab25a5cb92453756237840e (patch) | |
| tree | 5631a6ea4495ae2eb5058fb63b25dea3b197d61b /net/wireless/scan.c | |
| parent | d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4 (diff) | |
| parent | bcb628d579a61d0ab0cac4c6cc8a403de5254920 (diff) | |
| download | linux-f6d773cd4f3c18c40ab25a5cb92453756237840e.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless/scan.c')
| -rw-r--r-- | net/wireless/scan.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 2e8c515f3c5c..e2d344ff6745 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -650,9 +650,15 @@ int cfg80211_wext_siwscan(struct net_device *dev, i = 0; for (band = 0; band < IEEE80211_NUM_BANDS; band++) { int j; + if (!wiphy->bands[band]) continue; + for (j = 0; j < wiphy->bands[band]->n_channels; j++) { + /* ignore disabled channels */ + if (wiphy->bands[band]->channels[j].flags & + IEEE80211_CHAN_DISABLED) + continue; /* If we have a wireless request structure and the * wireless request specifies frequencies, then search |