Skip to content

L
linux-davinci
Commit 717c9339 authored by Dan Williams's avatar Dan Williams Committed by John W. Linville
Browse files
Options

[PATCH] libertas: reduce SSID and BSSID mixed-case abuse 

Kill mixed case function names from scan.c/scan.h.
Signed-off-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8cf1dc09
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
drivers/net/wireless/libertas/assoc.c
View file @ 717c9339
...@@ -58,11 +58,11 @@ static int assoc_helper_essid(wlan_private *priv, ...@@ -58,11 +58,11 @@ static int assoc_helper_essid(wlan_private *priv,
escape_essid(assoc_req->ssid, assoc_req->ssid_len)); escape_essid(assoc_req->ssid, assoc_req->ssid_len));
if (assoc_req->mode == IW_MODE_INFRA) { if (assoc_req->mode == IW_MODE_INFRA) {
if (adapter->prescan) { if (adapter->prescan) {
libertas_send_specific_SSID_scan(priv, assoc_req->ssid, libertas_send_specific_ssid_scan(priv, assoc_req->ssid,
assoc_req->ssid_len, 0); assoc_req->ssid_len, 0);
} }
bss = libertas_find_SSID_in_list(adapter, assoc_req->ssid, bss = libertas_find_ssid_in_list(adapter, assoc_req->ssid,
assoc_req->ssid_len, NULL, IW_MODE_INFRA, channel); assoc_req->ssid_len, NULL, IW_MODE_INFRA, channel);
if (bss != NULL) { if (bss != NULL) {
lbs_deb_assoc("SSID found in scan list, associating\n"); lbs_deb_assoc("SSID found in scan list, associating\n");
...@@ -75,11 +75,11 @@ static int assoc_helper_essid(wlan_private *priv, ...@@ -75,11 +75,11 @@ static int assoc_helper_essid(wlan_private *priv,
/* Scan for the network, do not save previous results. Stale /* Scan for the network, do not save previous results. Stale
* scan data will cause us to join a non-existant adhoc network * scan data will cause us to join a non-existant adhoc network
*/ */
libertas_send_specific_SSID_scan(priv, assoc_req->ssid, libertas_send_specific_ssid_scan(priv, assoc_req->ssid,
assoc_req->ssid_len, 1); assoc_req->ssid_len, 1);
/* Search for the requested SSID in the scan table */ /* Search for the requested SSID in the scan table */
bss = libertas_find_SSID_in_list(adapter, assoc_req->ssid, bss = libertas_find_ssid_in_list(adapter, assoc_req->ssid,
assoc_req->ssid_len, NULL, IW_MODE_ADHOC, channel); assoc_req->ssid_len, NULL, IW_MODE_ADHOC, channel);
if (bss != NULL) { if (bss != NULL) {
lbs_deb_assoc("SSID found, will join\n"); lbs_deb_assoc("SSID found, will join\n");
...@@ -111,7 +111,7 @@ static int assoc_helper_bssid(wlan_private *priv, ...@@ -111,7 +111,7 @@ static int assoc_helper_bssid(wlan_private *priv,
MAC_ARG(assoc_req->bssid)); MAC_ARG(assoc_req->bssid));
/* Search for index position in list for requested MAC */ /* Search for index position in list for requested MAC */
bss = libertas_find_BSSID_in_list(adapter, assoc_req->bssid, bss = libertas_find_bssid_in_list(adapter, assoc_req->bssid,
assoc_req->mode); assoc_req->mode);
if (bss == NULL) { if (bss == NULL) {
lbs_deb_assoc("ASSOC: WAP: BSSID " MAC_FMT " not found, " lbs_deb_assoc("ASSOC: WAP: BSSID " MAC_FMT " not found, "
...@@ -419,7 +419,7 @@ static int should_stop_adhoc(wlan_adapter *adapter, ...@@ -419,7 +419,7 @@ static int should_stop_adhoc(wlan_adapter *adapter,
if (adapter->connect_status != libertas_connected) if (adapter->connect_status != libertas_connected)
return 0; return 0;
if (libertas_SSID_cmp(adapter->curbssparams.ssid, if (libertas_ssid_cmp(adapter->curbssparams.ssid,
adapter->curbssparams.ssid_len, adapter->curbssparams.ssid_len,
assoc_req->ssid, assoc_req->ssid_len) != 0) assoc_req->ssid, assoc_req->ssid_len) != 0)
return 1; return 1;
...@@ -475,7 +475,7 @@ void libertas_association_worker(struct work_struct *work) ...@@ -475,7 +475,7 @@ void libertas_association_worker(struct work_struct *work)
if (find_any_ssid) { if (find_any_ssid) {
u8 new_mode; u8 new_mode;
ret = libertas_find_best_network_SSID(priv, assoc_req->ssid, ret = libertas_find_best_network_ssid(priv, assoc_req->ssid,
&assoc_req->ssid_len, assoc_req->mode, &new_mode); &assoc_req->ssid_len, assoc_req->mode, &new_mode);
if (ret) { if (ret) {
lbs_deb_assoc("Could not find best network\n"); lbs_deb_assoc("Could not find best network\n");
......
drivers/net/wireless/libertas/debugfs.c
View file @ 717c9339
...@@ -185,7 +185,7 @@ static ssize_t libertas_extscan(struct file *file, const char __user *userbuf, ...@@ -185,7 +185,7 @@ static ssize_t libertas_extscan(struct file *file, const char __user *userbuf,
goto out_unlock; goto out_unlock;
} }
libertas_send_specific_SSID_scan(priv, buf, strlen(buf)-1, 0); libertas_send_specific_ssid_scan(priv, buf, strlen(buf)-1, 0);
memset(&wrqu, 0, sizeof(union iwreq_data)); memset(&wrqu, 0, sizeof(union iwreq_data));
wireless_send_event(priv->dev, SIOCGIWSCAN, &wrqu, NULL); wireless_send_event(priv->dev, SIOCGIWSCAN, &wrqu, NULL);
......
drivers/net/wireless/libertas/join.c
View file @ 717c9339
...@@ -195,7 +195,7 @@ int libertas_join_adhoc_network(wlan_private * priv, struct assoc_request * asso ...@@ -195,7 +195,7 @@ int libertas_join_adhoc_network(wlan_private * priv, struct assoc_request * asso
/* check if the requested SSID is already joined */ /* check if the requested SSID is already joined */
if (adapter->curbssparams.ssid_len if (adapter->curbssparams.ssid_len
&& !libertas_SSID_cmp(adapter->curbssparams.ssid, && !libertas_ssid_cmp(adapter->curbssparams.ssid,
adapter->curbssparams.ssid_len, adapter->curbssparams.ssid_len,
bss->ssid, bss->ssid_len) bss->ssid, bss->ssid_len)
&& (adapter->mode == IW_MODE_ADHOC)) { && (adapter->mode == IW_MODE_ADHOC)) {
......
drivers/net/wireless/libertas/scan.c
View file @ 717c9339
...@@ -1197,7 +1197,7 @@ done: ...@@ -1197,7 +1197,7 @@ done:
* *
* @return 0--ssid is same, otherwise is different * @return 0--ssid is same, otherwise is different
*/ */
int libertas_SSID_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len) int libertas_ssid_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len)
{ {
if (ssid1_len != ssid2_len) if (ssid1_len != ssid2_len)
return -1; return -1;
...@@ -1214,7 +1214,7 @@ int libertas_SSID_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len) ...@@ -1214,7 +1214,7 @@ int libertas_SSID_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len)
* *
* @return index in BSSID list, or error return code (< 0) * @return index in BSSID list, or error return code (< 0)
*/ */
struct bss_descriptor * libertas_find_BSSID_in_list(wlan_adapter * adapter, struct bss_descriptor * libertas_find_bssid_in_list(wlan_adapter * adapter,
u8 * bssid, u8 mode) u8 * bssid, u8 mode)
{ {
struct bss_descriptor * iter_bss; struct bss_descriptor * iter_bss;
...@@ -1261,7 +1261,7 @@ struct bss_descriptor * libertas_find_BSSID_in_list(wlan_adapter * adapter, ...@@ -1261,7 +1261,7 @@ struct bss_descriptor * libertas_find_BSSID_in_list(wlan_adapter * adapter,
* *
* @return index in BSSID list * @return index in BSSID list
*/ */
struct bss_descriptor * libertas_find_SSID_in_list(wlan_adapter * adapter, struct bss_descriptor * libertas_find_ssid_in_list(wlan_adapter * adapter,
u8 *ssid, u8 ssid_len, u8 * bssid, u8 mode, u8 *ssid, u8 ssid_len, u8 * bssid, u8 mode,
int channel) int channel)
{ {
...@@ -1277,7 +1277,7 @@ struct bss_descriptor * libertas_find_SSID_in_list(wlan_adapter * adapter, ...@@ -1277,7 +1277,7 @@ struct bss_descriptor * libertas_find_SSID_in_list(wlan_adapter * adapter,
|| (iter_bss->last_scanned < tmp_oldest->last_scanned)) || (iter_bss->last_scanned < tmp_oldest->last_scanned))
tmp_oldest = iter_bss; tmp_oldest = iter_bss;
if (libertas_SSID_cmp(iter_bss->ssid, iter_bss->ssid_len, if (libertas_ssid_cmp(iter_bss->ssid, iter_bss->ssid_len,
ssid, ssid_len) != 0) ssid, ssid_len) != 0)
continue; /* ssid doesn't match */ continue; /* ssid doesn't match */
if (bssid && compare_ether_addr(iter_bss->bssid, bssid) != 0) if (bssid && compare_ether_addr(iter_bss->bssid, bssid) != 0)
...@@ -1327,7 +1327,7 @@ out: ...@@ -1327,7 +1327,7 @@ out:
* *
* @return index in BSSID list * @return index in BSSID list
*/ */
struct bss_descriptor * libertas_find_best_SSID_in_list(wlan_adapter * adapter, struct bss_descriptor * libertas_find_best_ssid_in_list(wlan_adapter * adapter,
u8 mode) u8 mode)
{ {
u8 bestrssi = 0; u8 bestrssi = 0;
...@@ -1369,7 +1369,7 @@ struct bss_descriptor * libertas_find_best_SSID_in_list(wlan_adapter * adapter, ...@@ -1369,7 +1369,7 @@ struct bss_descriptor * libertas_find_best_SSID_in_list(wlan_adapter * adapter,
* *
* @return 0--success, otherwise--fail * @return 0--success, otherwise--fail
*/ */
int libertas_find_best_network_SSID(wlan_private * priv, int libertas_find_best_network_ssid(wlan_private * priv,
u8 *out_ssid, u8 *out_ssid_len, u8 preferred_mode, u8 *out_mode) u8 *out_ssid, u8 *out_ssid_len, u8 preferred_mode, u8 *out_mode)
{ {
wlan_adapter *adapter = priv->adapter; wlan_adapter *adapter = priv->adapter;
...@@ -1384,7 +1384,7 @@ int libertas_find_best_network_SSID(wlan_private * priv, ...@@ -1384,7 +1384,7 @@ int libertas_find_best_network_SSID(wlan_private * priv,
wait_event_interruptible(adapter->cmd_pending, !adapter->nr_cmd_pending); wait_event_interruptible(adapter->cmd_pending, !adapter->nr_cmd_pending);
found = libertas_find_best_SSID_in_list(adapter, preferred_mode); found = libertas_find_best_ssid_in_list(adapter, preferred_mode);
if (found && (found->ssid_len > 0)) { if (found && (found->ssid_len > 0)) {
memcpy(out_ssid, &found->ssid, IW_ESSID_MAX_SIZE); memcpy(out_ssid, &found->ssid, IW_ESSID_MAX_SIZE);
*out_ssid_len = found->ssid_len; *out_ssid_len = found->ssid_len;
...@@ -1432,7 +1432,7 @@ int libertas_set_scan(struct net_device *dev, struct iw_request_info *info, ...@@ -1432,7 +1432,7 @@ int libertas_set_scan(struct net_device *dev, struct iw_request_info *info,
* *
* @return 0-success, otherwise fail * @return 0-success, otherwise fail
*/ */
int libertas_send_specific_SSID_scan(wlan_private * priv, int libertas_send_specific_ssid_scan(wlan_private * priv,
u8 *ssid, u8 ssid_len, u8 clear_ssid) u8 *ssid, u8 ssid_len, u8 clear_ssid)
{ {
wlan_adapter *adapter = priv->adapter; wlan_adapter *adapter = priv->adapter;
...@@ -1468,7 +1468,7 @@ out: ...@@ -1468,7 +1468,7 @@ out:
* *
* @return 0-success, otherwise fail * @return 0-success, otherwise fail
*/ */
int libertas_send_specific_BSSID_scan(wlan_private * priv, u8 * bssid, u8 clear_bssid) int libertas_send_specific_bssid_scan(wlan_private * priv, u8 * bssid, u8 clear_bssid)
{ {
struct wlan_ioctl_user_scan_cfg scancfg; struct wlan_ioctl_user_scan_cfg scancfg;
...@@ -1561,7 +1561,7 @@ static inline char *libertas_translate_scan(wlan_private *priv, ...@@ -1561,7 +1561,7 @@ static inline char *libertas_translate_scan(wlan_private *priv,
*/ */
if ((adapter->mode == IW_MODE_ADHOC) if ((adapter->mode == IW_MODE_ADHOC)
&& adapter->adhoccreate && adapter->adhoccreate
&& !libertas_SSID_cmp(adapter->curbssparams.ssid, && !libertas_ssid_cmp(adapter->curbssparams.ssid,
adapter->curbssparams.ssid_len, adapter->curbssparams.ssid_len,
bss->ssid, bss->ssid_len)) { bss->ssid, bss->ssid_len)) {
int snr, nf; int snr, nf;
...@@ -1598,7 +1598,7 @@ static inline char *libertas_translate_scan(wlan_private *priv, ...@@ -1598,7 +1598,7 @@ static inline char *libertas_translate_scan(wlan_private *priv,
stop, &iwe, IW_EV_PARAM_LEN); stop, &iwe, IW_EV_PARAM_LEN);
} }
if ((bss->mode == IW_MODE_ADHOC) if ((bss->mode == IW_MODE_ADHOC)
&& !libertas_SSID_cmp(adapter->curbssparams.ssid, && !libertas_ssid_cmp(adapter->curbssparams.ssid,
adapter->curbssparams.ssid_len, adapter->curbssparams.ssid_len,
bss->ssid, bss->ssid_len) bss->ssid, bss->ssid_len)
&& adapter->adhoccreate) { && adapter->adhoccreate) {
......
drivers/net/wireless/libertas/scan.h
View file @ 717c9339
...@@ -175,24 +175,24 @@ struct bss_descriptor { ...@@ -175,24 +175,24 @@ struct bss_descriptor {
struct list_head list; struct list_head list;
}; };
extern int libertas_SSID_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len); extern int libertas_ssid_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len);
struct bss_descriptor * libertas_find_SSID_in_list(wlan_adapter * adapter, struct bss_descriptor * libertas_find_ssid_in_list(wlan_adapter * adapter,
u8 *ssid, u8 ssid_len, u8 * bssid, u8 mode, u8 *ssid, u8 ssid_len, u8 * bssid, u8 mode,
int channel); int channel);
struct bss_descriptor * libertas_find_best_SSID_in_list(wlan_adapter * adapter, struct bss_descriptor * libertas_find_best_ssid_in_list(wlan_adapter * adapter,
u8 mode); u8 mode);
extern struct bss_descriptor * libertas_find_BSSID_in_list(wlan_adapter * adapter, extern struct bss_descriptor * libertas_find_bssid_in_list(wlan_adapter * adapter,
u8 * bssid, u8 mode); u8 * bssid, u8 mode);
int libertas_find_best_network_SSID(wlan_private * priv, u8 *out_ssid, int libertas_find_best_network_ssid(wlan_private * priv, u8 *out_ssid,
u8 *out_ssid_len, u8 preferred_mode, u8 *out_mode); u8 *out_ssid_len, u8 preferred_mode, u8 *out_mode);
extern int libertas_send_specific_SSID_scan(wlan_private * priv, u8 *ssid, extern int libertas_send_specific_ssid_scan(wlan_private * priv, u8 *ssid,
u8 ssid_len, u8 clear_ssid); u8 ssid_len, u8 clear_ssid);
extern int libertas_send_specific_BSSID_scan(wlan_private * priv, extern int libertas_send_specific_bssid_scan(wlan_private * priv,
u8 * bssid, u8 clear_bssid); u8 * bssid, u8 clear_bssid);
extern int libertas_cmd_80211_scan(wlan_private * priv, extern int libertas_cmd_80211_scan(wlan_private * priv,
......
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