aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2200.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ipw2200.c')
-rw-r--r--drivers/net/wireless/ipw2200.c118
1 files changed, 59 insertions, 59 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 6ec6de2960ee..22278f87d1c1 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -4409,8 +4409,8 @@ static void ipw_rx_notification(struct ipw_priv *priv,
4409 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | 4409 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
4410 IPW_DL_ASSOC, 4410 IPW_DL_ASSOC,
4411 "associated: '%s' %pM \n", 4411 "associated: '%s' %pM \n",
4412 escape_essid(priv->essid, 4412 escape_ssid(priv->essid,
4413 priv->essid_len), 4413 priv->essid_len),
4414 priv->bssid); 4414 priv->bssid);
4415 4415
4416 switch (priv->ieee->iw_mode) { 4416 switch (priv->ieee->iw_mode) {
@@ -4490,10 +4490,10 @@ static void ipw_rx_notification(struct ipw_priv *priv,
4490 "deauthenticated: '%s' " 4490 "deauthenticated: '%s' "
4491 "%pM" 4491 "%pM"
4492 ": (0x%04X) - %s \n", 4492 ": (0x%04X) - %s \n",
4493 escape_essid(priv-> 4493 escape_ssid(priv->
4494 essid, 4494 essid,
4495 priv-> 4495 priv->
4496 essid_len), 4496 essid_len),
4497 priv->bssid, 4497 priv->bssid,
4498 le16_to_cpu(auth->status), 4498 le16_to_cpu(auth->status),
4499 ipw_get_status_code 4499 ipw_get_status_code
@@ -4512,7 +4512,7 @@ static void ipw_rx_notification(struct ipw_priv *priv,
4512 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | 4512 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
4513 IPW_DL_ASSOC, 4513 IPW_DL_ASSOC,
4514 "authenticated: '%s' %pM\n", 4514 "authenticated: '%s' %pM\n",
4515 escape_essid(priv->essid, 4515 escape_ssid(priv->essid,
4516 priv->essid_len), 4516 priv->essid_len),
4517 priv->bssid); 4517 priv->bssid);
4518 break; 4518 break;
@@ -4540,7 +4540,7 @@ static void ipw_rx_notification(struct ipw_priv *priv,
4540 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | 4540 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
4541 IPW_DL_ASSOC, 4541 IPW_DL_ASSOC,
4542 "disassociated: '%s' %pM \n", 4542 "disassociated: '%s' %pM \n",
4543 escape_essid(priv->essid, 4543 escape_ssid(priv->essid,
4544 priv->essid_len), 4544 priv->essid_len),
4545 priv->bssid); 4545 priv->bssid);
4546 4546
@@ -4578,7 +4578,7 @@ static void ipw_rx_notification(struct ipw_priv *priv,
4578 case CMAS_AUTHENTICATED: 4578 case CMAS_AUTHENTICATED:
4579 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE, 4579 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
4580 "authenticated: '%s' %pM \n", 4580 "authenticated: '%s' %pM \n",
4581 escape_essid(priv->essid, 4581 escape_ssid(priv->essid,
4582 priv->essid_len), 4582 priv->essid_len),
4583 priv->bssid); 4583 priv->bssid);
4584 priv->status |= STATUS_AUTH; 4584 priv->status |= STATUS_AUTH;
@@ -4597,8 +4597,8 @@ static void ipw_rx_notification(struct ipw_priv *priv,
4597 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | 4597 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
4598 IPW_DL_ASSOC, 4598 IPW_DL_ASSOC,
4599 "deauthenticated: '%s' %pM\n", 4599 "deauthenticated: '%s' %pM\n",
4600 escape_essid(priv->essid, 4600 escape_ssid(priv->essid,
4601 priv->essid_len), 4601 priv->essid_len),
4602 priv->bssid); 4602 priv->bssid);
4603 4603
4604 priv->status &= ~(STATUS_ASSOCIATING | 4604 priv->status &= ~(STATUS_ASSOCIATING |
@@ -5430,7 +5430,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
5430 !(network->capability & WLAN_CAPABILITY_IBSS))) { 5430 !(network->capability & WLAN_CAPABILITY_IBSS))) {
5431 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded due to " 5431 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded due to "
5432 "capability mismatch.\n", 5432 "capability mismatch.\n",
5433 escape_essid(network->ssid, network->ssid_len), 5433 escape_ssid(network->ssid, network->ssid_len),
5434 network->bssid); 5434 network->bssid);
5435 return 0; 5435 return 0;
5436 } 5436 }
@@ -5440,7 +5440,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
5440 if (network->flags & NETWORK_EMPTY_ESSID) { 5440 if (network->flags & NETWORK_EMPTY_ESSID) {
5441 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded " 5441 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
5442 "because of hidden ESSID.\n", 5442 "because of hidden ESSID.\n",
5443 escape_essid(network->ssid, network->ssid_len), 5443 escape_ssid(network->ssid, network->ssid_len),
5444 network->bssid); 5444 network->bssid);
5445 return 0; 5445 return 0;
5446 } 5446 }
@@ -5453,8 +5453,8 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
5453 network->ssid_len)) { 5453 network->ssid_len)) {
5454 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded " 5454 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
5455 "because of non-network ESSID.\n", 5455 "because of non-network ESSID.\n",
5456 escape_essid(network->ssid, 5456 escape_ssid(network->ssid,
5457 network->ssid_len), 5457 network->ssid_len),
5458 network->bssid); 5458 network->bssid);
5459 return 0; 5459 return 0;
5460 } 5460 }
@@ -5468,13 +5468,13 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
5468 char escaped[IW_ESSID_MAX_SIZE * 2 + 1]; 5468 char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
5469 5469
5470 strncpy(escaped, 5470 strncpy(escaped,
5471 escape_essid(network->ssid, network->ssid_len), 5471 escape_ssid(network->ssid, network->ssid_len),
5472 sizeof(escaped)); 5472 sizeof(escaped));
5473 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded " 5473 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
5474 "because of ESSID mismatch: '%s'.\n", 5474 "because of ESSID mismatch: '%s'.\n",
5475 escaped, network->bssid, 5475 escaped, network->bssid,
5476 escape_essid(priv->essid, 5476 escape_ssid(priv->essid,
5477 priv->essid_len)); 5477 priv->essid_len));
5478 return 0; 5478 return 0;
5479 } 5479 }
5480 } 5480 }
@@ -5485,14 +5485,14 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
5485 if (network->time_stamp[0] < match->network->time_stamp[0]) { 5485 if (network->time_stamp[0] < match->network->time_stamp[0]) {
5486 IPW_DEBUG_MERGE("Network '%s excluded because newer than " 5486 IPW_DEBUG_MERGE("Network '%s excluded because newer than "
5487 "current network.\n", 5487 "current network.\n",
5488 escape_essid(match->network->ssid, 5488 escape_ssid(match->network->ssid,
5489 match->network->ssid_len)); 5489 match->network->ssid_len));
5490 return 0; 5490 return 0;
5491 } else if (network->time_stamp[1] < match->network->time_stamp[1]) { 5491 } else if (network->time_stamp[1] < match->network->time_stamp[1]) {
5492 IPW_DEBUG_MERGE("Network '%s excluded because newer than " 5492 IPW_DEBUG_MERGE("Network '%s excluded because newer than "
5493 "current network.\n", 5493 "current network.\n",
5494 escape_essid(match->network->ssid, 5494 escape_ssid(match->network->ssid,
5495 match->network->ssid_len)); 5495 match->network->ssid_len));
5496 return 0; 5496 return 0;
5497 } 5497 }
5498 5498
@@ -5501,7 +5501,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
5501 time_after(jiffies, network->last_scanned + priv->ieee->scan_age)) { 5501 time_after(jiffies, network->last_scanned + priv->ieee->scan_age)) {
5502 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded " 5502 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
5503 "because of age: %ums.\n", 5503 "because of age: %ums.\n",
5504 escape_essid(network->ssid, network->ssid_len), 5504 escape_ssid(network->ssid, network->ssid_len),
5505 network->bssid, 5505 network->bssid,
5506 jiffies_to_msecs(jiffies - 5506 jiffies_to_msecs(jiffies -
5507 network->last_scanned)); 5507 network->last_scanned));
@@ -5512,7 +5512,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
5512 (network->channel != priv->channel)) { 5512 (network->channel != priv->channel)) {
5513 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded " 5513 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
5514 "because of channel mismatch: %d != %d.\n", 5514 "because of channel mismatch: %d != %d.\n",
5515 escape_essid(network->ssid, network->ssid_len), 5515 escape_ssid(network->ssid, network->ssid_len),
5516 network->bssid, 5516 network->bssid,
5517 network->channel, priv->channel); 5517 network->channel, priv->channel);
5518 return 0; 5518 return 0;
@@ -5523,7 +5523,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
5523 ((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) { 5523 ((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) {
5524 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded " 5524 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
5525 "because of privacy mismatch: %s != %s.\n", 5525 "because of privacy mismatch: %s != %s.\n",
5526 escape_essid(network->ssid, network->ssid_len), 5526 escape_ssid(network->ssid, network->ssid_len),
5527 network->bssid, 5527 network->bssid,
5528 priv-> 5528 priv->
5529 capability & CAP_PRIVACY_ON ? "on" : "off", 5529 capability & CAP_PRIVACY_ON ? "on" : "off",
@@ -5536,8 +5536,8 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
5536 if (!memcmp(network->bssid, priv->bssid, ETH_ALEN)) { 5536 if (!memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
5537 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded " 5537 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
5538 "because of the same BSSID match: %pM" 5538 "because of the same BSSID match: %pM"
5539 ".\n", escape_essid(network->ssid, 5539 ".\n", escape_ssid(network->ssid,
5540 network->ssid_len), 5540 network->ssid_len),
5541 network->bssid, 5541 network->bssid,
5542 priv->bssid); 5542 priv->bssid);
5543 return 0; 5543 return 0;
@@ -5548,7 +5548,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
5548 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded " 5548 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
5549 "because of invalid frequency/mode " 5549 "because of invalid frequency/mode "
5550 "combination.\n", 5550 "combination.\n",
5551 escape_essid(network->ssid, network->ssid_len), 5551 escape_ssid(network->ssid, network->ssid_len),
5552 network->bssid); 5552 network->bssid);
5553 return 0; 5553 return 0;
5554 } 5554 }
@@ -5559,7 +5559,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
5559 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded " 5559 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
5560 "because configured rate mask excludes " 5560 "because configured rate mask excludes "
5561 "AP mandatory rate.\n", 5561 "AP mandatory rate.\n",
5562 escape_essid(network->ssid, network->ssid_len), 5562 escape_ssid(network->ssid, network->ssid_len),
5563 network->bssid); 5563 network->bssid);
5564 return 0; 5564 return 0;
5565 } 5565 }
@@ -5567,7 +5567,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
5567 if (rates.num_rates == 0) { 5567 if (rates.num_rates == 0) {
5568 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded " 5568 IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
5569 "because of no compatible rates.\n", 5569 "because of no compatible rates.\n",
5570 escape_essid(network->ssid, network->ssid_len), 5570 escape_ssid(network->ssid, network->ssid_len),
5571 network->bssid); 5571 network->bssid);
5572 return 0; 5572 return 0;
5573 } 5573 }
@@ -5580,7 +5580,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
5580 ipw_copy_rates(&match->rates, &rates); 5580 ipw_copy_rates(&match->rates, &rates);
5581 match->network = network; 5581 match->network = network;
5582 IPW_DEBUG_MERGE("Network '%s (%pM)' is a viable match.\n", 5582 IPW_DEBUG_MERGE("Network '%s (%pM)' is a viable match.\n",
5583 escape_essid(network->ssid, network->ssid_len), 5583 escape_ssid(network->ssid, network->ssid_len),
5584 network->bssid); 5584 network->bssid);
5585 5585
5586 return 1; 5586 return 1;
@@ -5618,8 +5618,8 @@ static void ipw_merge_adhoc_network(struct work_struct *work)
5618 mutex_lock(&priv->mutex); 5618 mutex_lock(&priv->mutex);
5619 if ((priv->ieee->iw_mode == IW_MODE_ADHOC)) { 5619 if ((priv->ieee->iw_mode == IW_MODE_ADHOC)) {
5620 IPW_DEBUG_MERGE("remove network %s\n", 5620 IPW_DEBUG_MERGE("remove network %s\n",
5621 escape_essid(priv->essid, 5621 escape_ssid(priv->essid,
5622 priv->essid_len)); 5622 priv->essid_len));
5623 ipw_remove_current_network(priv); 5623 ipw_remove_current_network(priv);
5624 } 5624 }
5625 5625
@@ -5644,7 +5644,7 @@ static int ipw_best_network(struct ipw_priv *priv,
5644 !(network->capability & WLAN_CAPABILITY_IBSS))) { 5644 !(network->capability & WLAN_CAPABILITY_IBSS))) {
5645 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded due to " 5645 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded due to "
5646 "capability mismatch.\n", 5646 "capability mismatch.\n",
5647 escape_essid(network->ssid, network->ssid_len), 5647 escape_ssid(network->ssid, network->ssid_len),
5648 network->bssid); 5648 network->bssid);
5649 return 0; 5649 return 0;
5650 } 5650 }
@@ -5654,7 +5654,7 @@ static int ipw_best_network(struct ipw_priv *priv,
5654 if (network->flags & NETWORK_EMPTY_ESSID) { 5654 if (network->flags & NETWORK_EMPTY_ESSID) {
5655 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded " 5655 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
5656 "because of hidden ESSID.\n", 5656 "because of hidden ESSID.\n",
5657 escape_essid(network->ssid, network->ssid_len), 5657 escape_ssid(network->ssid, network->ssid_len),
5658 network->bssid); 5658 network->bssid);
5659 return 0; 5659 return 0;
5660 } 5660 }
@@ -5667,7 +5667,7 @@ static int ipw_best_network(struct ipw_priv *priv,
5667 network->ssid_len)) { 5667 network->ssid_len)) {
5668 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded " 5668 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
5669 "because of non-network ESSID.\n", 5669 "because of non-network ESSID.\n",
5670 escape_essid(network->ssid, 5670 escape_ssid(network->ssid,
5671 network->ssid_len), 5671 network->ssid_len),
5672 network->bssid); 5672 network->bssid);
5673 return 0; 5673 return 0;
@@ -5681,13 +5681,13 @@ static int ipw_best_network(struct ipw_priv *priv,
5681 min(network->ssid_len, priv->essid_len)))) { 5681 min(network->ssid_len, priv->essid_len)))) {
5682 char escaped[IW_ESSID_MAX_SIZE * 2 + 1]; 5682 char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
5683 strncpy(escaped, 5683 strncpy(escaped,
5684 escape_essid(network->ssid, network->ssid_len), 5684 escape_ssid(network->ssid, network->ssid_len),
5685 sizeof(escaped)); 5685 sizeof(escaped));
5686 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded " 5686 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
5687 "because of ESSID mismatch: '%s'.\n", 5687 "because of ESSID mismatch: '%s'.\n",
5688 escaped, network->bssid, 5688 escaped, network->bssid,
5689 escape_essid(priv->essid, 5689 escape_ssid(priv->essid,
5690 priv->essid_len)); 5690 priv->essid_len));
5691 return 0; 5691 return 0;
5692 } 5692 }
5693 } 5693 }
@@ -5697,13 +5697,13 @@ static int ipw_best_network(struct ipw_priv *priv,
5697 if (match->network && match->network->stats.rssi > network->stats.rssi) { 5697 if (match->network && match->network->stats.rssi > network->stats.rssi) {
5698 char escaped[IW_ESSID_MAX_SIZE * 2 + 1]; 5698 char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
5699 strncpy(escaped, 5699 strncpy(escaped,
5700 escape_essid(network->ssid, network->ssid_len), 5700 escape_ssid(network->ssid, network->ssid_len),
5701 sizeof(escaped)); 5701 sizeof(escaped));
5702 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded because " 5702 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded because "
5703 "'%s (%pM)' has a stronger signal.\n", 5703 "'%s (%pM)' has a stronger signal.\n",
5704 escaped, network->bssid, 5704 escaped, network->bssid,
5705 escape_essid(match->network->ssid, 5705 escape_ssid(match->network->ssid,
5706 match->network->ssid_len), 5706 match->network->ssid_len),
5707 match->network->bssid); 5707 match->network->bssid);
5708 return 0; 5708 return 0;
5709 } 5709 }
@@ -5715,7 +5715,7 @@ static int ipw_best_network(struct ipw_priv *priv,
5715 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded " 5715 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
5716 "because of storming (%ums since last " 5716 "because of storming (%ums since last "
5717 "assoc attempt).\n", 5717 "assoc attempt).\n",
5718 escape_essid(network->ssid, network->ssid_len), 5718 escape_ssid(network->ssid, network->ssid_len),
5719 network->bssid, 5719 network->bssid,
5720 jiffies_to_msecs(jiffies - 5720 jiffies_to_msecs(jiffies -
5721 network->last_associate)); 5721 network->last_associate));
@@ -5727,7 +5727,7 @@ static int ipw_best_network(struct ipw_priv *priv,
5727 time_after(jiffies, network->last_scanned + priv->ieee->scan_age)) { 5727 time_after(jiffies, network->last_scanned + priv->ieee->scan_age)) {
5728 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded " 5728 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
5729 "because of age: %ums.\n", 5729 "because of age: %ums.\n",
5730 escape_essid(network->ssid, network->ssid_len), 5730 escape_ssid(network->ssid, network->ssid_len),
5731 network->bssid, 5731 network->bssid,
5732 jiffies_to_msecs(jiffies - 5732 jiffies_to_msecs(jiffies -
5733 network->last_scanned)); 5733 network->last_scanned));
@@ -5738,7 +5738,7 @@ static int ipw_best_network(struct ipw_priv *priv,
5738 (network->channel != priv->channel)) { 5738 (network->channel != priv->channel)) {
5739 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded " 5739 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
5740 "because of channel mismatch: %d != %d.\n", 5740 "because of channel mismatch: %d != %d.\n",
5741 escape_essid(network->ssid, network->ssid_len), 5741 escape_ssid(network->ssid, network->ssid_len),
5742 network->bssid, 5742 network->bssid,
5743 network->channel, priv->channel); 5743 network->channel, priv->channel);
5744 return 0; 5744 return 0;
@@ -5749,7 +5749,7 @@ static int ipw_best_network(struct ipw_priv *priv,
5749 ((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) { 5749 ((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) {
5750 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded " 5750 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
5751 "because of privacy mismatch: %s != %s.\n", 5751 "because of privacy mismatch: %s != %s.\n",
5752 escape_essid(network->ssid, network->ssid_len), 5752 escape_ssid(network->ssid, network->ssid_len),
5753 network->bssid, 5753 network->bssid,
5754 priv->capability & CAP_PRIVACY_ON ? "on" : 5754 priv->capability & CAP_PRIVACY_ON ? "on" :
5755 "off", 5755 "off",
@@ -5762,7 +5762,7 @@ static int ipw_best_network(struct ipw_priv *priv,
5762 memcmp(network->bssid, priv->bssid, ETH_ALEN)) { 5762 memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
5763 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded " 5763 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
5764 "because of BSSID mismatch: %pM.\n", 5764 "because of BSSID mismatch: %pM.\n",
5765 escape_essid(network->ssid, network->ssid_len), 5765 escape_ssid(network->ssid, network->ssid_len),
5766 network->bssid, priv->bssid); 5766 network->bssid, priv->bssid);
5767 return 0; 5767 return 0;
5768 } 5768 }
@@ -5772,7 +5772,7 @@ static int ipw_best_network(struct ipw_priv *priv,
5772 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded " 5772 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
5773 "because of invalid frequency/mode " 5773 "because of invalid frequency/mode "
5774 "combination.\n", 5774 "combination.\n",
5775 escape_essid(network->ssid, network->ssid_len), 5775 escape_ssid(network->ssid, network->ssid_len),
5776 network->bssid); 5776 network->bssid);
5777 return 0; 5777 return 0;
5778 } 5778 }
@@ -5781,7 +5781,7 @@ static int ipw_best_network(struct ipw_priv *priv,
5781 if (!ieee80211_is_valid_channel(priv->ieee, network->channel)) { 5781 if (!ieee80211_is_valid_channel(priv->ieee, network->channel)) {
5782 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded " 5782 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
5783 "because of invalid channel in current GEO\n", 5783 "because of invalid channel in current GEO\n",
5784 escape_essid(network->ssid, network->ssid_len), 5784 escape_ssid(network->ssid, network->ssid_len),
5785 network->bssid); 5785 network->bssid);
5786 return 0; 5786 return 0;
5787 } 5787 }
@@ -5792,7 +5792,7 @@ static int ipw_best_network(struct ipw_priv *priv,
5792 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded " 5792 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
5793 "because configured rate mask excludes " 5793 "because configured rate mask excludes "
5794 "AP mandatory rate.\n", 5794 "AP mandatory rate.\n",
5795 escape_essid(network->ssid, network->ssid_len), 5795 escape_ssid(network->ssid, network->ssid_len),
5796 network->bssid); 5796 network->bssid);
5797 return 0; 5797 return 0;
5798 } 5798 }
@@ -5800,7 +5800,7 @@ static int ipw_best_network(struct ipw_priv *priv,
5800 if (rates.num_rates == 0) { 5800 if (rates.num_rates == 0) {
5801 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded " 5801 IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
5802 "because of no compatible rates.\n", 5802 "because of no compatible rates.\n",
5803 escape_essid(network->ssid, network->ssid_len), 5803 escape_ssid(network->ssid, network->ssid_len),
5804 network->bssid); 5804 network->bssid);
5805 return 0; 5805 return 0;
5806 } 5806 }
@@ -5814,7 +5814,7 @@ static int ipw_best_network(struct ipw_priv *priv,
5814 match->network = network; 5814 match->network = network;
5815 5815
5816 IPW_DEBUG_ASSOC("Network '%s (%pM)' is a viable match.\n", 5816 IPW_DEBUG_ASSOC("Network '%s (%pM)' is a viable match.\n",
5817 escape_essid(network->ssid, network->ssid_len), 5817 escape_ssid(network->ssid, network->ssid_len),
5818 network->bssid); 5818 network->bssid);
5819 5819
5820 return 1; 5820 return 1;
@@ -6065,7 +6065,7 @@ static void ipw_debug_config(struct ipw_priv *priv)
6065 IPW_DEBUG_INFO("Channel unlocked.\n"); 6065 IPW_DEBUG_INFO("Channel unlocked.\n");
6066 if (priv->config & CFG_STATIC_ESSID) 6066 if (priv->config & CFG_STATIC_ESSID)
6067 IPW_DEBUG_INFO("ESSID locked to '%s'\n", 6067 IPW_DEBUG_INFO("ESSID locked to '%s'\n",
6068 escape_essid(priv->essid, priv->essid_len)); 6068 escape_ssid(priv->essid, priv->essid_len));
6069 else 6069 else
6070 IPW_DEBUG_INFO("ESSID unlocked.\n"); 6070 IPW_DEBUG_INFO("ESSID unlocked.\n");
6071 if (priv->config & CFG_STATIC_BSSID) 6071 if (priv->config & CFG_STATIC_BSSID)
@@ -7352,7 +7352,7 @@ static int ipw_associate_network(struct ipw_priv *priv,
7352 IPW_DEBUG_ASSOC("%sssocation attempt: '%s', channel %d, " 7352 IPW_DEBUG_ASSOC("%sssocation attempt: '%s', channel %d, "
7353 "802.11%c [%d], %s[:%s], enc=%s%s%s%c%c\n", 7353 "802.11%c [%d], %s[:%s], enc=%s%s%s%c%c\n",
7354 roaming ? "Rea" : "A", 7354 roaming ? "Rea" : "A",
7355 escape_essid(priv->essid, priv->essid_len), 7355 escape_ssid(priv->essid, priv->essid_len),
7356 network->channel, 7356 network->channel,
7357 ipw_modes[priv->assoc_request.ieee_mode], 7357 ipw_modes[priv->assoc_request.ieee_mode],
7358 rates->num_rates, 7358 rates->num_rates,
@@ -7452,7 +7452,7 @@ static int ipw_associate_network(struct ipw_priv *priv,
7452 } 7452 }
7453 7453
7454 IPW_DEBUG(IPW_DL_STATE, "associating: '%s' %pM \n", 7454 IPW_DEBUG(IPW_DL_STATE, "associating: '%s' %pM \n",
7455 escape_essid(priv->essid, priv->essid_len), 7455 escape_ssid(priv->essid, priv->essid_len),
7456 priv->bssid); 7456 priv->bssid);
7457 7457
7458 return 0; 7458 return 0;
@@ -7604,8 +7604,8 @@ static int ipw_associate(void *data)
7604 target = oldest; 7604 target = oldest;
7605 IPW_DEBUG_ASSOC("Expired '%s' (%pM) from " 7605 IPW_DEBUG_ASSOC("Expired '%s' (%pM) from "
7606 "network list.\n", 7606 "network list.\n",
7607 escape_essid(target->ssid, 7607 escape_ssid(target->ssid,
7608 target->ssid_len), 7608 target->ssid_len),
7609 target->bssid); 7609 target->bssid);
7610 list_add_tail(&target->list, 7610 list_add_tail(&target->list,
7611 &priv->ieee->network_free_list); 7611 &priv->ieee->network_free_list);
@@ -9057,7 +9057,7 @@ static int ipw_wx_set_essid(struct net_device *dev,
9057 return 0; 9057 return 0;
9058 } 9058 }
9059 9059
9060 IPW_DEBUG_WX("Setting ESSID: '%s' (%d)\n", escape_essid(extra, length), 9060 IPW_DEBUG_WX("Setting ESSID: '%s' (%d)\n", escape_ssid(extra, length),
9061 length); 9061 length);
9062 9062
9063 priv->essid_len = length; 9063 priv->essid_len = length;
@@ -9084,7 +9084,7 @@ static int ipw_wx_get_essid(struct net_device *dev,
9084 if (priv->config & CFG_STATIC_ESSID || 9084 if (priv->config & CFG_STATIC_ESSID ||
9085 priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) { 9085 priv->status & (STATUS_ASSOCIATED | STATUS_ASSOCIATING)) {
9086 IPW_DEBUG_WX("Getting essid: '%s'\n", 9086 IPW_DEBUG_WX("Getting essid: '%s'\n",
9087 escape_essid(priv->essid, priv->essid_len)); 9087 escape_ssid(priv->essid, priv->essid_len));
9088 memcpy(extra, priv->essid, priv->essid_len); 9088 memcpy(extra, priv->essid, priv->essid_len);
9089 wrqu->essid.length = priv->essid_len; 9089 wrqu->essid.length = priv->essid_len;
9090 wrqu->essid.flags = 1; /* active */ 9090 wrqu->essid.flags = 1; /* active */
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-02 14:38:58 -0500