Skip to content

L
linux-davinci
Commit 78e4f36e authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files
Options

[PATCH] softmac: select "best" network based on rssi 

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 51da28a8
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
net/ieee80211/softmac/ieee80211softmac_assoc.c
View file @ 78e4f36e
...@@ -167,6 +167,8 @@ ieee80211softmac_assoc_work(void *d) ...@@ -167,6 +167,8 @@ ieee80211softmac_assoc_work(void *d)
/* Search the ieee80211 networks for this network if we didn't find it */ /* Search the ieee80211 networks for this network if we didn't find it */
if (!found) if (!found)
{ {
s8 rssi = -128; /* if I don't initialise, gcc emits an invalid warning
because it cannot follow the best pointer logic. */
spin_lock_irqsave(&mac->ieee->lock, flags); spin_lock_irqsave(&mac->ieee->lock, flags);
list_for_each_entry(net, &mac->ieee->network_list, list) { list_for_each_entry(net, &mac->ieee->network_list, list) {
/* we're supposed to find the network with /* we're supposed to find the network with
...@@ -174,7 +176,7 @@ ieee80211softmac_assoc_work(void *d) ...@@ -174,7 +176,7 @@ ieee80211softmac_assoc_work(void *d)
* any network with a specific ESSID, and many * any network with a specific ESSID, and many
* different ones could have that. * different ones could have that.
* *
* I'll for now implement just finding one at all * I'll for now just go with the reported rssi.
* *
* We also should take into account the rateset * We also should take into account the rateset
* here to find the best BSSID to try. * here to find the best BSSID to try.
...@@ -182,15 +184,17 @@ ieee80211softmac_assoc_work(void *d) ...@@ -182,15 +184,17 @@ ieee80211softmac_assoc_work(void *d)
if (network_matches_request(mac, net)) { if (network_matches_request(mac, net)) {
if (!best) { if (!best) {
best = net; best = net;
rssi = best->stats.rssi;
continue; continue;
} }
/* we already had a matching network, so /* we already had a matching network, so
* compare their properties to get the * compare their properties to get the
* better of the two ... (see above) * better of the two ... (see above)
*/ */
/* TODO */ if (rssi < net->stats.rssi) {
/* for now, just */ best = net;
break; rssi = best->stats.rssi;
}
} }
} }
/* if we unlock here, we might get interrupted and the `best' /* if we unlock here, we might get interrupted and the `best'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment