GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-07 23:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PATCH] libertas: use MAC_FMT and MAC_ARG where appropriate

Browse source 
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Dan Williams 2007-05-25 17:27:31 -04:00 • committed by John W. Linville
parent e76850d620
commit 02eb229bbd
3 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/wireless/libertas/debugfs.c
View file

@ -74,11 +74,9 @@ static ssize_t libertas_getscantable(struct file *file, char __user *userbuf,
memcpy(&cap, &iter_bss->cap, sizeof(cap)); memcpy(&cap, &iter_bss->cap, sizeof(cap));
pos += snprintf(buf+pos, len-pos, pos += snprintf(buf+pos, len-pos,
"%02u| %03d | %03ld | %02x:%02x:%02x:%02x:%02x:%02x |", "%02u| %03d | %03ld | " MAC_FMT " |",
numscansdone, iter_bss->channel, iter_bss->rssi, numscansdone, iter_bss->channel, iter_bss->rssi,
iter_bss->bssid[0], iter_bss->bssid[1], MAC_ARG(iter_bss->bssid));
iter_bss->bssid[2], iter_bss->bssid[3],
iter_bss->bssid[4], iter_bss->bssid[5]);
pos += snprintf(buf+pos, len-pos, " %04x-", cap); pos += snprintf(buf+pos, len-pos, " %04x-", cap);
pos += snprintf(buf+pos, len-pos, "%c%c%c |", pos += snprintf(buf+pos, len-pos, "%c%c%c |",
iter_bss->cap.ibss ? 'A' : 'I', iter_bss->cap.ibss ? 'A' : 'I',

9
drivers/net/wireless/libertas/join.c
View file

@ -286,8 +286,7 @@ int libertas_cmd_80211_authenticate(wlan_private * priv,
memcpy(pauthenticate->macaddr, bssid, ETH_ALEN); memcpy(pauthenticate->macaddr, bssid, ETH_ALEN);
lbs_deb_join("AUTH_CMD: Bssid is : %x:%x:%x:%x:%x:%x\n", lbs_deb_join("AUTH_CMD: Bssid is : " MAC_FMT "\n", MAC_ARG(bssid));
bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]);
ret = 0; ret = 0;
out: out:
@ -865,10 +864,8 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
lbs_deb_join("ADHOC_RESP: - Joined/Started Ad Hoc\n"); lbs_deb_join("ADHOC_RESP: - Joined/Started Ad Hoc\n");
lbs_deb_join("ADHOC_RESP: channel = %d\n", adapter->curbssparams.channel); lbs_deb_join("ADHOC_RESP: channel = %d\n", adapter->curbssparams.channel);
lbs_deb_join("ADHOC_RESP: BSSID = %02x:%02x:%02x:%02x:%02x:%02x\n", lbs_deb_join("ADHOC_RESP: BSSID = " MAC_FMT "\n",
padhocresult->BSSID[0], padhocresult->BSSID[1], MAC_ARG(padhocresult->BSSID));
padhocresult->BSSID[2], padhocresult->BSSID[3],
padhocresult->BSSID[4], padhocresult->BSSID[5]);
done: done:
lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret); lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);

10
drivers/net/wireless/libertas/scan.c
View file

@ -241,10 +241,8 @@ static void wlan_scan_process_results(wlan_private * priv)
mutex_lock(&adapter->lock); mutex_lock(&adapter->lock);
list_for_each_entry (iter_bss, &adapter->network_list, list) { list_for_each_entry (iter_bss, &adapter->network_list, list) {
lbs_deb_scan("Scan:(%02d) " MAC_FMT ", RSSI[%03d], SSID[%s]\n", lbs_deb_scan("Scan:(%02d) " MAC_FMT ", RSSI[%03d], SSID[%s]\n",
i++, i++, MAC_ARG(iter_bss->bssid), (s32) iter_bss->rssi,
iter_bss->bssid[0], iter_bss->bssid[1], iter_bss->bssid[2], iter_bss->ssid.ssid);
iter_bss->bssid[3], iter_bss->bssid[4], iter_bss->bssid[5],
(s32) iter_bss->rssi, iter_bss->ssid.ssid);
} }
mutex_unlock(&adapter->lock); mutex_unlock(&adapter->lock);
} }
@ -983,9 +981,7 @@ static int libertas_process_bss(struct bss_descriptor * bss,
bytesleftforcurrentbeacon = beaconsize; bytesleftforcurrentbeacon = beaconsize;
memcpy(bss->bssid, pcurrentptr, ETH_ALEN); memcpy(bss->bssid, pcurrentptr, ETH_ALEN);
lbs_deb_scan("process_bss: AP BSSID " MAC_FMT "\n", lbs_deb_scan("process_bss: AP BSSID " MAC_FMT "\n", MAC_ARG(bss->bssid));
bss->bssid[0], bss->bssid[1], bss->bssid[2],
bss->bssid[3], bss->bssid[4], bss->bssid[5]);
pcurrentptr += ETH_ALEN; pcurrentptr += ETH_ALEN;
bytesleftforcurrentbeacon -= ETH_ALEN; bytesleftforcurrentbeacon -= ETH_ALEN;