diff options
Diffstat (limited to 'drivers/net/wireless/libertas/join.c')
-rw-r--r-- | drivers/net/wireless/libertas/join.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c index 0ad1362b14e2..8dcff00574f3 100644 --- a/drivers/net/wireless/libertas/join.c +++ b/drivers/net/wireless/libertas/join.c | |||
@@ -293,6 +293,7 @@ int libertas_cmd_80211_authenticate(wlan_private * priv, | |||
293 | struct cmd_ds_802_11_authenticate *pauthenticate = &cmd->params.auth; | 293 | struct cmd_ds_802_11_authenticate *pauthenticate = &cmd->params.auth; |
294 | int ret = -1; | 294 | int ret = -1; |
295 | u8 *bssid = pdata_buf; | 295 | u8 *bssid = pdata_buf; |
296 | DECLARE_MAC_BUF(mac); | ||
296 | 297 | ||
297 | lbs_deb_enter(LBS_DEB_JOIN); | 298 | lbs_deb_enter(LBS_DEB_JOIN); |
298 | 299 | ||
@@ -319,8 +320,8 @@ int libertas_cmd_80211_authenticate(wlan_private * priv, | |||
319 | 320 | ||
320 | memcpy(pauthenticate->macaddr, bssid, ETH_ALEN); | 321 | memcpy(pauthenticate->macaddr, bssid, ETH_ALEN); |
321 | 322 | ||
322 | lbs_deb_join("AUTH_CMD: BSSID is : " MAC_FMT " auth=0x%X\n", | 323 | lbs_deb_join("AUTH_CMD: BSSID is : %s auth=0x%X\n", |
323 | MAC_ARG(bssid), pauthenticate->authtype); | 324 | print_mac(mac, bssid), pauthenticate->authtype); |
324 | ret = 0; | 325 | ret = 0; |
325 | 326 | ||
326 | out: | 327 | out: |
@@ -598,6 +599,7 @@ int libertas_cmd_80211_ad_hoc_join(wlan_private * priv, | |||
598 | int cmdappendsize = 0; | 599 | int cmdappendsize = 0; |
599 | int ret = 0; | 600 | int ret = 0; |
600 | u16 ratesize = 0; | 601 | u16 ratesize = 0; |
602 | DECLARE_MAC_BUF(mac); | ||
601 | 603 | ||
602 | lbs_deb_enter(LBS_DEB_JOIN); | 604 | lbs_deb_enter(LBS_DEB_JOIN); |
603 | 605 | ||
@@ -621,8 +623,9 @@ int libertas_cmd_80211_ad_hoc_join(wlan_private * priv, | |||
621 | 623 | ||
622 | /* information on BSSID descriptor passed to FW */ | 624 | /* information on BSSID descriptor passed to FW */ |
623 | lbs_deb_join( | 625 | lbs_deb_join( |
624 | "ADHOC_J_CMD: BSSID = " MAC_FMT ", SSID = '%s'\n", | 626 | "ADHOC_J_CMD: BSSID = %s, SSID = '%s'\n", |
625 | MAC_ARG(join_cmd->bss.bssid), join_cmd->bss.ssid); | 627 | print_mac(mac, join_cmd->bss.bssid), |
628 | join_cmd->bss.ssid); | ||
626 | 629 | ||
627 | /* failtimeout */ | 630 | /* failtimeout */ |
628 | join_cmd->failtimeout = cpu_to_le16(MRVDRV_ASSOCIATION_TIME_OUT); | 631 | join_cmd->failtimeout = cpu_to_le16(MRVDRV_ASSOCIATION_TIME_OUT); |
@@ -829,6 +832,7 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv, | |||
829 | struct cmd_ds_802_11_ad_hoc_result *padhocresult; | 832 | struct cmd_ds_802_11_ad_hoc_result *padhocresult; |
830 | union iwreq_data wrqu; | 833 | union iwreq_data wrqu; |
831 | struct bss_descriptor *bss; | 834 | struct bss_descriptor *bss; |
835 | DECLARE_MAC_BUF(mac); | ||
832 | 836 | ||
833 | lbs_deb_enter(LBS_DEB_JOIN); | 837 | lbs_deb_enter(LBS_DEB_JOIN); |
834 | 838 | ||
@@ -894,8 +898,8 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv, | |||
894 | 898 | ||
895 | lbs_deb_join("ADHOC_RESP: - Joined/Started Ad Hoc\n"); | 899 | lbs_deb_join("ADHOC_RESP: - Joined/Started Ad Hoc\n"); |
896 | lbs_deb_join("ADHOC_RESP: channel = %d\n", adapter->curbssparams.channel); | 900 | lbs_deb_join("ADHOC_RESP: channel = %d\n", adapter->curbssparams.channel); |
897 | lbs_deb_join("ADHOC_RESP: BSSID = " MAC_FMT "\n", | 901 | lbs_deb_join("ADHOC_RESP: BSSID = %s\n", |
898 | MAC_ARG(padhocresult->bssid)); | 902 | print_mac(mac, padhocresult->bssid)); |
899 | 903 | ||
900 | done: | 904 | done: |
901 | lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret); | 905 | lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret); |