aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/libertas/assoc.c14
-rw-r--r--drivers/net/wireless/libertas/debugfs.c2
-rw-r--r--drivers/net/wireless/libertas/join.c2
-rw-r--r--drivers/net/wireless/libertas/scan.c22
-rw-r--r--drivers/net/wireless/libertas/scan.h14
5 files changed, 27 insertions, 27 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index c2029b397503..ee82413b426d 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -58,11 +58,11 @@ static int assoc_helper_essid(wlan_private *priv,
58 escape_essid(assoc_req->ssid, assoc_req->ssid_len)); 58 escape_essid(assoc_req->ssid, assoc_req->ssid_len));
59 if (assoc_req->mode == IW_MODE_INFRA) { 59 if (assoc_req->mode == IW_MODE_INFRA) {
60 if (adapter->prescan) { 60 if (adapter->prescan) {
61 libertas_send_specific_SSID_scan(priv, assoc_req->ssid, 61 libertas_send_specific_ssid_scan(priv, assoc_req->ssid,
62 assoc_req->ssid_len, 0); 62 assoc_req->ssid_len, 0);
63 } 63 }
64 64
65 bss = libertas_find_SSID_in_list(adapter, assoc_req->ssid, 65 bss = libertas_find_ssid_in_list(adapter, assoc_req->ssid,
66 assoc_req->ssid_len, NULL, IW_MODE_INFRA, channel); 66 assoc_req->ssid_len, NULL, IW_MODE_INFRA, channel);
67 if (bss != NULL) { 67 if (bss != NULL) {
68 lbs_deb_assoc("SSID found in scan list, associating\n"); 68 lbs_deb_assoc("SSID found in scan list, associating\n");
@@ -75,11 +75,11 @@ static int assoc_helper_essid(wlan_private *priv,
75 /* Scan for the network, do not save previous results. Stale 75 /* Scan for the network, do not save previous results. Stale
76 * scan data will cause us to join a non-existant adhoc network 76 * scan data will cause us to join a non-existant adhoc network
77 */ 77 */
78 libertas_send_specific_SSID_scan(priv, assoc_req->ssid, 78 libertas_send_specific_ssid_scan(priv, assoc_req->ssid,
79 assoc_req->ssid_len, 1); 79 assoc_req->ssid_len, 1);
80 80
81 /* Search for the requested SSID in the scan table */ 81 /* Search for the requested SSID in the scan table */
82 bss = libertas_find_SSID_in_list(adapter, assoc_req->ssid, 82 bss = libertas_find_ssid_in_list(adapter, assoc_req->ssid,
83 assoc_req->ssid_len, NULL, IW_MODE_ADHOC, channel); 83 assoc_req->ssid_len, NULL, IW_MODE_ADHOC, channel);
84 if (bss != NULL) { 84 if (bss != NULL) {
85 lbs_deb_assoc("SSID found, will join\n"); 85 lbs_deb_assoc("SSID found, will join\n");
@@ -111,7 +111,7 @@ static int assoc_helper_bssid(wlan_private *priv,
111 MAC_ARG(assoc_req->bssid)); 111 MAC_ARG(assoc_req->bssid));
112 112
113 /* Search for index position in list for requested MAC */ 113 /* Search for index position in list for requested MAC */
114 bss = libertas_find_BSSID_in_list(adapter, assoc_req->bssid, 114 bss = libertas_find_bssid_in_list(adapter, assoc_req->bssid,
115 assoc_req->mode); 115 assoc_req->mode);
116 if (bss == NULL) { 116 if (bss == NULL) {
117 lbs_deb_assoc("ASSOC: WAP: BSSID " MAC_FMT " not found, " 117 lbs_deb_assoc("ASSOC: WAP: BSSID " MAC_FMT " not found, "
@@ -419,7 +419,7 @@ static int should_stop_adhoc(wlan_adapter *adapter,
419 if (adapter->connect_status != libertas_connected) 419 if (adapter->connect_status != libertas_connected)
420 return 0; 420 return 0;
421 421
422 if (libertas_SSID_cmp(adapter->curbssparams.ssid, 422 if (libertas_ssid_cmp(adapter->curbssparams.ssid,
423 adapter->curbssparams.ssid_len, 423 adapter->curbssparams.ssid_len,
424 assoc_req->ssid, assoc_req->ssid_len) != 0) 424 assoc_req->ssid, assoc_req->ssid_len) != 0)
425 return 1; 425 return 1;
@@ -475,7 +475,7 @@ void libertas_association_worker(struct work_struct *work)
475 if (find_any_ssid) { 475 if (find_any_ssid) {
476 u8 new_mode; 476 u8 new_mode;
477 477
478 ret = libertas_find_best_network_SSID(priv, assoc_req->ssid, 478 ret = libertas_find_best_network_ssid(priv, assoc_req->ssid,
479 &assoc_req->ssid_len, assoc_req->mode, &new_mode); 479 &assoc_req->ssid_len, assoc_req->mode, &new_mode);
480 if (ret) { 480 if (ret) {
481 lbs_deb_assoc("Could not find best network\n"); 481 lbs_deb_assoc("Could not find best network\n");
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 902b4be19d40..715cbdaa1d4b 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -185,7 +185,7 @@ static ssize_t libertas_extscan(struct file *file, const char __user *userbuf,
185 goto out_unlock; 185 goto out_unlock;
186 } 186 }
187 187
188 libertas_send_specific_SSID_scan(priv, buf, strlen(buf)-1, 0); 188 libertas_send_specific_ssid_scan(priv, buf, strlen(buf)-1, 0);
189 189
190 memset(&wrqu, 0, sizeof(union iwreq_data)); 190 memset(&wrqu, 0, sizeof(union iwreq_data));
191 wireless_send_event(priv->dev, SIOCGIWSCAN, &wrqu, NULL); 191 wireless_send_event(priv->dev, SIOCGIWSCAN, &wrqu, NULL);
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index 1f866aa29a62..78ac3064a0bd 100644
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -195,7 +195,7 @@ int libertas_join_adhoc_network(wlan_private * priv, struct assoc_request * asso
195 195
196 /* check if the requested SSID is already joined */ 196 /* check if the requested SSID is already joined */
197 if (adapter->curbssparams.ssid_len 197 if (adapter->curbssparams.ssid_len
198 && !libertas_SSID_cmp(adapter->curbssparams.ssid, 198 && !libertas_ssid_cmp(adapter->curbssparams.ssid,
199 adapter->curbssparams.ssid_len, 199 adapter->curbssparams.ssid_len,
200 bss->ssid, bss->ssid_len) 200 bss->ssid, bss->ssid_len)
201 && (adapter->mode == IW_MODE_ADHOC)) { 201 && (adapter->mode == IW_MODE_ADHOC)) {
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 5790e8bc1aec..606af50fa09b 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -1197,7 +1197,7 @@ done:
1197 * 1197 *
1198 * @return 0--ssid is same, otherwise is different 1198 * @return 0--ssid is same, otherwise is different
1199 */ 1199 */
1200int libertas_SSID_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len) 1200int libertas_ssid_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len)
1201{ 1201{
1202 if (ssid1_len != ssid2_len) 1202 if (ssid1_len != ssid2_len)
1203 return -1; 1203 return -1;
@@ -1214,7 +1214,7 @@ int libertas_SSID_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len)
1214 * 1214 *
1215 * @return index in BSSID list, or error return code (< 0) 1215 * @return index in BSSID list, or error return code (< 0)
1216 */ 1216 */
1217struct bss_descriptor * libertas_find_BSSID_in_list(wlan_adapter * adapter, 1217struct bss_descriptor * libertas_find_bssid_in_list(wlan_adapter * adapter,
1218 u8 * bssid, u8 mode) 1218 u8 * bssid, u8 mode)
1219{ 1219{
1220 struct bss_descriptor * iter_bss; 1220 struct bss_descriptor * iter_bss;
@@ -1261,7 +1261,7 @@ struct bss_descriptor * libertas_find_BSSID_in_list(wlan_adapter * adapter,
1261 * 1261 *
1262 * @return index in BSSID list 1262 * @return index in BSSID list
1263 */ 1263 */
1264struct bss_descriptor * libertas_find_SSID_in_list(wlan_adapter * adapter, 1264struct bss_descriptor * libertas_find_ssid_in_list(wlan_adapter * adapter,
1265 u8 *ssid, u8 ssid_len, u8 * bssid, u8 mode, 1265 u8 *ssid, u8 ssid_len, u8 * bssid, u8 mode,
1266 int channel) 1266 int channel)
1267{ 1267{
@@ -1277,7 +1277,7 @@ struct bss_descriptor * libertas_find_SSID_in_list(wlan_adapter * adapter,
1277 || (iter_bss->last_scanned < tmp_oldest->last_scanned)) 1277 || (iter_bss->last_scanned < tmp_oldest->last_scanned))
1278 tmp_oldest = iter_bss; 1278 tmp_oldest = iter_bss;
1279 1279
1280 if (libertas_SSID_cmp(iter_bss->ssid, iter_bss->ssid_len, 1280 if (libertas_ssid_cmp(iter_bss->ssid, iter_bss->ssid_len,
1281 ssid, ssid_len) != 0) 1281 ssid, ssid_len) != 0)
1282 continue; /* ssid doesn't match */ 1282 continue; /* ssid doesn't match */
1283 if (bssid && compare_ether_addr(iter_bss->bssid, bssid) != 0) 1283 if (bssid && compare_ether_addr(iter_bss->bssid, bssid) != 0)
@@ -1327,7 +1327,7 @@ out:
1327 * 1327 *
1328 * @return index in BSSID list 1328 * @return index in BSSID list
1329 */ 1329 */
1330struct bss_descriptor * libertas_find_best_SSID_in_list(wlan_adapter * adapter, 1330struct bss_descriptor * libertas_find_best_ssid_in_list(wlan_adapter * adapter,
1331 u8 mode) 1331 u8 mode)
1332{ 1332{
1333 u8 bestrssi = 0; 1333 u8 bestrssi = 0;
@@ -1369,7 +1369,7 @@ struct bss_descriptor * libertas_find_best_SSID_in_list(wlan_adapter * adapter,
1369 * 1369 *
1370 * @return 0--success, otherwise--fail 1370 * @return 0--success, otherwise--fail
1371 */ 1371 */
1372int libertas_find_best_network_SSID(wlan_private * priv, 1372int libertas_find_best_network_ssid(wlan_private * priv,
1373 u8 *out_ssid, u8 *out_ssid_len, u8 preferred_mode, u8 *out_mode) 1373 u8 *out_ssid, u8 *out_ssid_len, u8 preferred_mode, u8 *out_mode)
1374{ 1374{
1375 wlan_adapter *adapter = priv->adapter; 1375 wlan_adapter *adapter = priv->adapter;
@@ -1384,7 +1384,7 @@ int libertas_find_best_network_SSID(wlan_private * priv,
1384 1384
1385 wait_event_interruptible(adapter->cmd_pending, !adapter->nr_cmd_pending); 1385 wait_event_interruptible(adapter->cmd_pending, !adapter->nr_cmd_pending);
1386 1386
1387 found = libertas_find_best_SSID_in_list(adapter, preferred_mode); 1387 found = libertas_find_best_ssid_in_list(adapter, preferred_mode);
1388 if (found && (found->ssid_len > 0)) { 1388 if (found && (found->ssid_len > 0)) {
1389 memcpy(out_ssid, &found->ssid, IW_ESSID_MAX_SIZE); 1389 memcpy(out_ssid, &found->ssid, IW_ESSID_MAX_SIZE);
1390 *out_ssid_len = found->ssid_len; 1390 *out_ssid_len = found->ssid_len;
@@ -1432,7 +1432,7 @@ int libertas_set_scan(struct net_device *dev, struct iw_request_info *info,
1432 * 1432 *
1433 * @return 0-success, otherwise fail 1433 * @return 0-success, otherwise fail
1434 */ 1434 */
1435int libertas_send_specific_SSID_scan(wlan_private * priv, 1435int libertas_send_specific_ssid_scan(wlan_private * priv,
1436 u8 *ssid, u8 ssid_len, u8 clear_ssid) 1436 u8 *ssid, u8 ssid_len, u8 clear_ssid)
1437{ 1437{
1438 wlan_adapter *adapter = priv->adapter; 1438 wlan_adapter *adapter = priv->adapter;
@@ -1468,7 +1468,7 @@ out:
1468 * 1468 *
1469 * @return 0-success, otherwise fail 1469 * @return 0-success, otherwise fail
1470 */ 1470 */
1471int libertas_send_specific_BSSID_scan(wlan_private * priv, u8 * bssid, u8 clear_bssid) 1471int libertas_send_specific_bssid_scan(wlan_private * priv, u8 * bssid, u8 clear_bssid)
1472{ 1472{
1473 struct wlan_ioctl_user_scan_cfg scancfg; 1473 struct wlan_ioctl_user_scan_cfg scancfg;
1474 1474
@@ -1561,7 +1561,7 @@ static inline char *libertas_translate_scan(wlan_private *priv,
1561 */ 1561 */
1562 if ((adapter->mode == IW_MODE_ADHOC) 1562 if ((adapter->mode == IW_MODE_ADHOC)
1563 && adapter->adhoccreate 1563 && adapter->adhoccreate
1564 && !libertas_SSID_cmp(adapter->curbssparams.ssid, 1564 && !libertas_ssid_cmp(adapter->curbssparams.ssid,
1565 adapter->curbssparams.ssid_len, 1565 adapter->curbssparams.ssid_len,
1566 bss->ssid, bss->ssid_len)) { 1566 bss->ssid, bss->ssid_len)) {
1567 int snr, nf; 1567 int snr, nf;
@@ -1598,7 +1598,7 @@ static inline char *libertas_translate_scan(wlan_private *priv,
1598 stop, &iwe, IW_EV_PARAM_LEN); 1598 stop, &iwe, IW_EV_PARAM_LEN);
1599 } 1599 }
1600 if ((bss->mode == IW_MODE_ADHOC) 1600 if ((bss->mode == IW_MODE_ADHOC)
1601 && !libertas_SSID_cmp(adapter->curbssparams.ssid, 1601 && !libertas_ssid_cmp(adapter->curbssparams.ssid,
1602 adapter->curbssparams.ssid_len, 1602 adapter->curbssparams.ssid_len,
1603 bss->ssid, bss->ssid_len) 1603 bss->ssid, bss->ssid_len)
1604 && adapter->adhoccreate) { 1604 && adapter->adhoccreate) {
diff --git a/drivers/net/wireless/libertas/scan.h b/drivers/net/wireless/libertas/scan.h
index 9ace3478c62a..bd019e5ff1eb 100644
--- a/drivers/net/wireless/libertas/scan.h
+++ b/drivers/net/wireless/libertas/scan.h
@@ -175,24 +175,24 @@ struct bss_descriptor {
175 struct list_head list; 175 struct list_head list;
176}; 176};
177 177
178extern int libertas_SSID_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len); 178extern int libertas_ssid_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len);
179 179
180struct bss_descriptor * libertas_find_SSID_in_list(wlan_adapter * adapter, 180struct bss_descriptor * libertas_find_ssid_in_list(wlan_adapter * adapter,
181 u8 *ssid, u8 ssid_len, u8 * bssid, u8 mode, 181 u8 *ssid, u8 ssid_len, u8 * bssid, u8 mode,
182 int channel); 182 int channel);
183 183
184struct bss_descriptor * libertas_find_best_SSID_in_list(wlan_adapter * adapter, 184struct bss_descriptor * libertas_find_best_ssid_in_list(wlan_adapter * adapter,
185 u8 mode); 185 u8 mode);
186 186
187extern struct bss_descriptor * libertas_find_BSSID_in_list(wlan_adapter * adapter, 187extern struct bss_descriptor * libertas_find_bssid_in_list(wlan_adapter * adapter,
188 u8 * bssid, u8 mode); 188 u8 * bssid, u8 mode);
189 189
190int libertas_find_best_network_SSID(wlan_private * priv, u8 *out_ssid, 190int libertas_find_best_network_ssid(wlan_private * priv, u8 *out_ssid,
191 u8 *out_ssid_len, u8 preferred_mode, u8 *out_mode); 191 u8 *out_ssid_len, u8 preferred_mode, u8 *out_mode);
192 192
193extern int libertas_send_specific_SSID_scan(wlan_private * priv, u8 *ssid, 193extern int libertas_send_specific_ssid_scan(wlan_private * priv, u8 *ssid,
194 u8 ssid_len, u8 clear_ssid); 194 u8 ssid_len, u8 clear_ssid);
195extern int libertas_send_specific_BSSID_scan(wlan_private * priv, 195extern int libertas_send_specific_bssid_scan(wlan_private * priv,
196 u8 * bssid, u8 clear_bssid); 196 u8 * bssid, u8 clear_bssid);
197 197
198extern int libertas_cmd_80211_scan(wlan_private * priv, 198extern int libertas_cmd_80211_scan(wlan_private * priv,