aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/assoc.c
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2009-10-22 09:30:47 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 16:48:36 -0400
commit243e84e91ed810f7dca5ba1c2d1a611811948566 (patch)
treee9c4a62a7ed787f3d509e00954a48b85c6ef75c1 /drivers/net/wireless/libertas/assoc.c
parentf4228b4c2e5864ee9d2051176beb2bd5a49a15cc (diff)
libertas: change IW_ESSID_MAX_SIZE -> IEEE80211_MAX_SSID_LEN
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Acked-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/assoc.c')
-rw-r--r--drivers/net/wireless/libertas/assoc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index f7161b5e070a..5a280ebadba4 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -226,7 +226,7 @@ static int lbs_assoc_post(struct lbs_private *priv,
226 priv->connect_status = LBS_CONNECTED; 226 priv->connect_status = LBS_CONNECTED;
227 227
228 /* Update current SSID and BSSID */ 228 /* Update current SSID and BSSID */
229 memcpy(&priv->curbssparams.ssid, &bss->ssid, IW_ESSID_MAX_SIZE); 229 memcpy(&priv->curbssparams.ssid, &bss->ssid, IEEE80211_MAX_SSID_LEN);
230 priv->curbssparams.ssid_len = bss->ssid_len; 230 priv->curbssparams.ssid_len = bss->ssid_len;
231 memcpy(priv->curbssparams.bssid, bss->bssid, ETH_ALEN); 231 memcpy(priv->curbssparams.bssid, bss->bssid, ETH_ALEN);
232 232
@@ -467,7 +467,7 @@ static int lbs_adhoc_post(struct lbs_private *priv,
467 memcpy(&priv->curbssparams.bssid, bss->bssid, ETH_ALEN); 467 memcpy(&priv->curbssparams.bssid, bss->bssid, ETH_ALEN);
468 468
469 /* Set the new SSID to current SSID */ 469 /* Set the new SSID to current SSID */
470 memcpy(&priv->curbssparams.ssid, &bss->ssid, IW_ESSID_MAX_SIZE); 470 memcpy(&priv->curbssparams.ssid, &bss->ssid, IEEE80211_MAX_SSID_LEN);
471 priv->curbssparams.ssid_len = bss->ssid_len; 471 priv->curbssparams.ssid_len = bss->ssid_len;
472 472
473 netif_carrier_on(priv->dev); 473 netif_carrier_on(priv->dev);
@@ -1083,7 +1083,7 @@ static int assoc_helper_essid(struct lbs_private *priv,
1083 /* else send START command */ 1083 /* else send START command */
1084 lbs_deb_assoc("SSID not found, creating adhoc network\n"); 1084 lbs_deb_assoc("SSID not found, creating adhoc network\n");
1085 memcpy(&assoc_req->bss.ssid, &assoc_req->ssid, 1085 memcpy(&assoc_req->bss.ssid, &assoc_req->ssid,
1086 IW_ESSID_MAX_SIZE); 1086 IEEE80211_MAX_SSID_LEN);
1087 assoc_req->bss.ssid_len = assoc_req->ssid_len; 1087 assoc_req->bss.ssid_len = assoc_req->ssid_len;
1088 lbs_adhoc_start(priv, assoc_req); 1088 lbs_adhoc_start(priv, assoc_req);
1089 } 1089 }
@@ -1541,7 +1541,7 @@ static int lbs_find_best_network_ssid(struct lbs_private *priv,
1541 1541
1542 found = lbs_find_best_ssid_in_list(priv, preferred_mode); 1542 found = lbs_find_best_ssid_in_list(priv, preferred_mode);
1543 if (found && (found->ssid_len > 0)) { 1543 if (found && (found->ssid_len > 0)) {
1544 memcpy(out_ssid, &found->ssid, IW_ESSID_MAX_SIZE); 1544 memcpy(out_ssid, &found->ssid, IEEE80211_MAX_SSID_LEN);
1545 *out_ssid_len = found->ssid_len; 1545 *out_ssid_len = found->ssid_len;
1546 *out_mode = found->mode; 1546 *out_mode = found->mode;
1547 ret = 0; 1547 ret = 0;
@@ -1759,7 +1759,7 @@ struct assoc_request *lbs_get_association_request(struct lbs_private *priv)
1759 assoc_req = priv->pending_assoc_req; 1759 assoc_req = priv->pending_assoc_req;
1760 if (!test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) { 1760 if (!test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
1761 memcpy(&assoc_req->ssid, &priv->curbssparams.ssid, 1761 memcpy(&assoc_req->ssid, &priv->curbssparams.ssid,
1762 IW_ESSID_MAX_SIZE); 1762 IEEE80211_MAX_SSID_LEN);
1763 assoc_req->ssid_len = priv->curbssparams.ssid_len; 1763 assoc_req->ssid_len = priv->curbssparams.ssid_len;
1764 } 1764 }
1765 1765