diff options
author | John W. Linville <linville@tuxdriver.com> | 2008-09-30 17:17:26 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:48 -0400 |
commit | c5d3dce875ef055ed9b14f169cc967cc2c8faf1f (patch) | |
tree | 778402be72b858ec6318c480cd19261079cd1f77 /drivers | |
parent | 7e272fcff6f0a32a3d46e600ea5895f6058f4e2d (diff) |
wireless: remove NETWORK_EMPTY_ESSID flag
It is unnecessary and of questionable value. Also remove
is_empty_ssid, as it is also unnecessary.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 22278f87d1c1..6e0c55c64e1f 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -5435,16 +5435,6 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, | |||
5435 | return 0; | 5435 | return 0; |
5436 | } | 5436 | } |
5437 | 5437 | ||
5438 | /* If we do not have an ESSID for this AP, we can not associate with | ||
5439 | * it */ | ||
5440 | if (network->flags & NETWORK_EMPTY_ESSID) { | ||
5441 | IPW_DEBUG_MERGE("Network '%s (%pM)' excluded " | ||
5442 | "because of hidden ESSID.\n", | ||
5443 | escape_ssid(network->ssid, network->ssid_len), | ||
5444 | network->bssid); | ||
5445 | return 0; | ||
5446 | } | ||
5447 | |||
5448 | if (unlikely(roaming)) { | 5438 | if (unlikely(roaming)) { |
5449 | /* If we are roaming, then ensure check if this is a valid | 5439 | /* If we are roaming, then ensure check if this is a valid |
5450 | * network to try and roam to */ | 5440 | * network to try and roam to */ |
@@ -5649,16 +5639,6 @@ static int ipw_best_network(struct ipw_priv *priv, | |||
5649 | return 0; | 5639 | return 0; |
5650 | } | 5640 | } |
5651 | 5641 | ||
5652 | /* If we do not have an ESSID for this AP, we can not associate with | ||
5653 | * it */ | ||
5654 | if (network->flags & NETWORK_EMPTY_ESSID) { | ||
5655 | IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded " | ||
5656 | "because of hidden ESSID.\n", | ||
5657 | escape_ssid(network->ssid, network->ssid_len), | ||
5658 | network->bssid); | ||
5659 | return 0; | ||
5660 | } | ||
5661 | |||
5662 | if (unlikely(roaming)) { | 5642 | if (unlikely(roaming)) { |
5663 | /* If we are roaming, then ensure check if this is a valid | 5643 | /* If we are roaming, then ensure check if this is a valid |
5664 | * network to try and roam to */ | 5644 | * network to try and roam to */ |
@@ -6881,8 +6861,7 @@ static int ipw_qos_handle_probe_response(struct ipw_priv *priv, | |||
6881 | if ((priv->status & STATUS_ASSOCIATED) && | 6861 | if ((priv->status & STATUS_ASSOCIATED) && |
6882 | (priv->ieee->iw_mode == IW_MODE_ADHOC) && (active_network == 0)) { | 6862 | (priv->ieee->iw_mode == IW_MODE_ADHOC) && (active_network == 0)) { |
6883 | if (memcmp(network->bssid, priv->bssid, ETH_ALEN)) | 6863 | if (memcmp(network->bssid, priv->bssid, ETH_ALEN)) |
6884 | if ((network->capability & WLAN_CAPABILITY_IBSS) && | 6864 | if (network->capability & WLAN_CAPABILITY_IBSS) |
6885 | !(network->flags & NETWORK_EMPTY_ESSID)) | ||
6886 | if ((network->ssid_len == | 6865 | if ((network->ssid_len == |
6887 | priv->assoc_network->ssid_len) && | 6866 | priv->assoc_network->ssid_len) && |
6888 | !memcmp(network->ssid, | 6867 | !memcmp(network->ssid, |