diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-07-30 08:11:30 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-05 22:03:40 +0200 |
| commit | aebb628f39ccf67fe9ed888c7f80926fc1070ce5 (patch) | |
| tree | 7857d5b2c207acf31064f61e498279615120e618 /drivers | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtma... (diff) | |
| download | linux-aebb628f39ccf67fe9ed888c7f80926fc1070ce5.tar.xz linux-aebb628f39ccf67fe9ed888c7f80926fc1070ce5.zip | |
libertas: get the right # of scanned BSSes
Let's actually check the right field in the command response; and
if there aren't any reported BSSes, exit early with success.
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/libertas/cfg.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c index 25f902760980..b60f66115061 100644 --- a/drivers/net/wireless/libertas/cfg.c +++ b/drivers/net/wireless/libertas/cfg.c @@ -465,7 +465,15 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy, lbs_deb_enter(LBS_DEB_CFG80211); bsssize = get_unaligned_le16(&scanresp->bssdescriptsize); - nr_sets = le16_to_cpu(resp->size); + nr_sets = le16_to_cpu(scanresp->nr_sets); + + lbs_deb_scan("scan response: %d BSSs (%d bytes); resp size %d bytes\n", + nr_sets, bsssize, le16_to_cpu(resp->size)); + + if (nr_sets == 0) { + ret = 0; + goto done; + } /* * The general layout of the scan response is described in chapter |