diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2011-05-27 07:24:02 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-01 15:36:30 -0400 |
| commit | 180cdc79c2204d0abe15509689dde631290f6a95 (patch) | |
| tree | d91d1cb7040ac01ab5a54e30c586465c759ff56a /net/wireless | |
| parent | 84288044dc9a50d2c0b0f1a024d7cd87ab3dd131 (diff) | |
| download | linux-stable-180cdc79c2204d0abe15509689dde631290f6a95.tar.gz linux-stable-180cdc79c2204d0abe15509689dde631290f6a95.tar.bz2 linux-stable-180cdc79c2204d0abe15509689dde631290f6a95.zip | |
cfg80211: skip disabled channels on channel survey
The channel survey information will be empy for
disabled channels so simply discard those entries.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 6d0d44b19ee6..70cbc8ca371e 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -3754,10 +3754,6 @@ static int nl80211_send_survey(struct sk_buff *msg, u32 pid, u32 seq, void *hdr; struct nlattr *infoattr; - /* Survey without a channel doesn't make sense */ - if (!survey->channel) - return -EINVAL; - hdr = nl80211hdr_put(msg, pid, seq, flags, NL80211_CMD_NEW_SURVEY_RESULTS); if (!hdr) @@ -3820,6 +3816,8 @@ static int nl80211_dump_survey(struct sk_buff *skb, } while (1) { + struct ieee80211_channel *chan; + res = dev->ops->dump_survey(&dev->wiphy, netdev, survey_idx, &survey); if (res == -ENOENT) @@ -3827,6 +3825,19 @@ static int nl80211_dump_survey(struct sk_buff *skb, if (res) goto out_err; + /* Survey without a channel doesn't make sense */ + if (!survey.channel) { + res = -EINVAL; + goto out; + } + + chan = ieee80211_get_channel(&dev->wiphy, + survey.channel->center_freq); + if (!chan || chan->flags & IEEE80211_CHAN_DISABLED) { + survey_idx++; + continue; + } + if (nl80211_send_survey(skb, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq, NLM_F_MULTI, |