diff options
| author | Javier Cardona <javier@cozybit.com> | 2008-11-07 11:22:09 -0800 |
|---|---|---|
| committer | Deepak Saxena <dsaxena@laptop.org> | 2008-11-11 12:10:30 -0800 |
| commit | 59e85c5d1381f7e20263e7ca484eb2081573df5d (patch) | |
| tree | d7e0c559464ff901e0a47c78a864ab5e0dc62e96 | |
| parent | fc9cfc450ad1d65c112599ebfd108bd76369457f (diff) | |
| download | lwn-59e85c5d1381f7e20263e7ca484eb2081573df5d.tar.gz lwn-59e85c5d1381f7e20263e7ca484eb2081573df5d.zip | |
libertas: Exclude mesh networks from main interface scan results.
This confuses NetworkManager and causes it to mix scan results from different
networks.
Signed-off-by: Javier Cardona <javier@cozybit.com>
| -rw-r--r-- | drivers/net/wireless/libertas/scan.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c index 18f237774f36..3647deccfec3 100644 --- a/drivers/net/wireless/libertas/scan.c +++ b/drivers/net/wireless/libertas/scan.c @@ -1437,8 +1437,10 @@ int lbs_get_scan(struct net_device *dev, struct iw_request_info *info, break; } - /* For mesh device, list only mesh networks */ - if (dev == priv->mesh_dev && !iter_bss->mesh) + /* For mesh device, list only mesh networks, + for main device, don't list mesh networks */ + if ((dev == priv->mesh_dev && !iter_bss->mesh) || + (dev == priv->dev && iter_bss->mesh)) continue; /* Prune old an old scan result */ |