diff options
author | Moritz Muehlenhoff <jmm@debian.org> | 2009-02-07 20:01:00 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 17:53:21 -0400 |
commit | a7cf7bae3297f16bb4a2f00310377fec06d0ecd6 (patch) | |
tree | 2629bb0c14524509f3b5ca4586d3e2b02b75d02d /drivers/staging/wlan-ng/prism2sta.c | |
parent | 16910554f3687c96d572664efc55057668a3f1cf (diff) |
Staging: wlan-ng: Replace WLAN_LOG_DEBUG() with printk(KERN_DEBUG
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng/prism2sta.c')
-rw-r--r-- | drivers/staging/wlan-ng/prism2sta.c | 63 |
1 files changed, 32 insertions, 31 deletions
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c index eb29a0a1939..95bca22cf11 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c | |||
@@ -65,6 +65,7 @@ | |||
65 | #include <linux/netdevice.h> | 65 | #include <linux/netdevice.h> |
66 | #include <linux/workqueue.h> | 66 | #include <linux/workqueue.h> |
67 | #include <linux/byteorder/generic.h> | 67 | #include <linux/byteorder/generic.h> |
68 | #include <linux/ctype.h> | ||
68 | 69 | ||
69 | #include <asm/io.h> | 70 | #include <asm/io.h> |
70 | #include <linux/delay.h> | 71 | #include <linux/delay.h> |
@@ -342,46 +343,46 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg) | |||
342 | switch( msg->msgcode ) | 343 | switch( msg->msgcode ) |
343 | { | 344 | { |
344 | case DIDmsg_dot11req_mibget : | 345 | case DIDmsg_dot11req_mibget : |
345 | WLAN_LOG_DEBUG(2,"Received mibget request\n"); | 346 | pr_debug("Received mibget request\n"); |
346 | result = prism2mgmt_mibset_mibget(wlandev, msg); | 347 | result = prism2mgmt_mibset_mibget(wlandev, msg); |
347 | break; | 348 | break; |
348 | case DIDmsg_dot11req_mibset : | 349 | case DIDmsg_dot11req_mibset : |
349 | WLAN_LOG_DEBUG(2,"Received mibset request\n"); | 350 | pr_debug("Received mibset request\n"); |
350 | result = prism2mgmt_mibset_mibget(wlandev, msg); | 351 | result = prism2mgmt_mibset_mibget(wlandev, msg); |
351 | break; | 352 | break; |
352 | case DIDmsg_dot11req_scan : | 353 | case DIDmsg_dot11req_scan : |
353 | WLAN_LOG_DEBUG(2,"Received scan request\n"); | 354 | pr_debug("Received scan request\n"); |
354 | result = prism2mgmt_scan(wlandev, msg); | 355 | result = prism2mgmt_scan(wlandev, msg); |
355 | break; | 356 | break; |
356 | case DIDmsg_dot11req_scan_results : | 357 | case DIDmsg_dot11req_scan_results : |
357 | WLAN_LOG_DEBUG(2,"Received scan_results request\n"); | 358 | pr_debug("Received scan_results request\n"); |
358 | result = prism2mgmt_scan_results(wlandev, msg); | 359 | result = prism2mgmt_scan_results(wlandev, msg); |
359 | break; | 360 | break; |
360 | case DIDmsg_dot11req_start : | 361 | case DIDmsg_dot11req_start : |
361 | WLAN_LOG_DEBUG(2,"Received mlme start request\n"); | 362 | pr_debug("Received mlme start request\n"); |
362 | result = prism2mgmt_start(wlandev, msg); | 363 | result = prism2mgmt_start(wlandev, msg); |
363 | break; | 364 | break; |
364 | /* | 365 | /* |
365 | * Prism2 specific messages | 366 | * Prism2 specific messages |
366 | */ | 367 | */ |
367 | case DIDmsg_p2req_readpda : | 368 | case DIDmsg_p2req_readpda : |
368 | WLAN_LOG_DEBUG(2,"Received mlme readpda request\n"); | 369 | pr_debug("Received mlme readpda request\n"); |
369 | result = prism2mgmt_readpda(wlandev, msg); | 370 | result = prism2mgmt_readpda(wlandev, msg); |
370 | break; | 371 | break; |
371 | case DIDmsg_p2req_ramdl_state : | 372 | case DIDmsg_p2req_ramdl_state : |
372 | WLAN_LOG_DEBUG(2,"Received mlme ramdl_state request\n"); | 373 | pr_debug("Received mlme ramdl_state request\n"); |
373 | result = prism2mgmt_ramdl_state(wlandev, msg); | 374 | result = prism2mgmt_ramdl_state(wlandev, msg); |
374 | break; | 375 | break; |
375 | case DIDmsg_p2req_ramdl_write : | 376 | case DIDmsg_p2req_ramdl_write : |
376 | WLAN_LOG_DEBUG(2,"Received mlme ramdl_write request\n"); | 377 | pr_debug("Received mlme ramdl_write request\n"); |
377 | result = prism2mgmt_ramdl_write(wlandev, msg); | 378 | result = prism2mgmt_ramdl_write(wlandev, msg); |
378 | break; | 379 | break; |
379 | case DIDmsg_p2req_flashdl_state : | 380 | case DIDmsg_p2req_flashdl_state : |
380 | WLAN_LOG_DEBUG(2,"Received mlme flashdl_state request\n"); | 381 | pr_debug("Received mlme flashdl_state request\n"); |
381 | result = prism2mgmt_flashdl_state(wlandev, msg); | 382 | result = prism2mgmt_flashdl_state(wlandev, msg); |
382 | break; | 383 | break; |
383 | case DIDmsg_p2req_flashdl_write : | 384 | case DIDmsg_p2req_flashdl_write : |
384 | WLAN_LOG_DEBUG(2,"Received mlme flashdl_write request\n"); | 385 | pr_debug("Received mlme flashdl_write request\n"); |
385 | result = prism2mgmt_flashdl_write(wlandev, msg); | 386 | result = prism2mgmt_flashdl_write(wlandev, msg); |
386 | break; | 387 | break; |
387 | /* | 388 | /* |
@@ -392,7 +393,7 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg) | |||
392 | case DIDmsg_lnxreq_ifstate : | 393 | case DIDmsg_lnxreq_ifstate : |
393 | { | 394 | { |
394 | p80211msg_lnxreq_ifstate_t *ifstatemsg; | 395 | p80211msg_lnxreq_ifstate_t *ifstatemsg; |
395 | WLAN_LOG_DEBUG(2,"Received mlme ifstate request\n"); | 396 | pr_debug("Received mlme ifstate request\n"); |
396 | ifstatemsg = (p80211msg_lnxreq_ifstate_t*)msg; | 397 | ifstatemsg = (p80211msg_lnxreq_ifstate_t*)msg; |
397 | result = prism2sta_ifstate(wlandev, ifstatemsg->ifstate.data); | 398 | result = prism2sta_ifstate(wlandev, ifstatemsg->ifstate.data); |
398 | ifstatemsg->resultcode.status = | 399 | ifstatemsg->resultcode.status = |
@@ -402,17 +403,17 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg) | |||
402 | } | 403 | } |
403 | break; | 404 | break; |
404 | case DIDmsg_lnxreq_wlansniff : | 405 | case DIDmsg_lnxreq_wlansniff : |
405 | WLAN_LOG_DEBUG(2,"Received mlme wlansniff request\n"); | 406 | pr_debug("Received mlme wlansniff request\n"); |
406 | result = prism2mgmt_wlansniff(wlandev, msg); | 407 | result = prism2mgmt_wlansniff(wlandev, msg); |
407 | break; | 408 | break; |
408 | case DIDmsg_lnxreq_autojoin : | 409 | case DIDmsg_lnxreq_autojoin : |
409 | WLAN_LOG_DEBUG(2,"Received mlme autojoin request\n"); | 410 | pr_debug("Received mlme autojoin request\n"); |
410 | result = prism2mgmt_autojoin(wlandev, msg); | 411 | result = prism2mgmt_autojoin(wlandev, msg); |
411 | break; | 412 | break; |
412 | case DIDmsg_lnxreq_commsquality: { | 413 | case DIDmsg_lnxreq_commsquality: { |
413 | p80211msg_lnxreq_commsquality_t *qualmsg; | 414 | p80211msg_lnxreq_commsquality_t *qualmsg; |
414 | 415 | ||
415 | WLAN_LOG_DEBUG(2,"Received commsquality request\n"); | 416 | pr_debug("Received commsquality request\n"); |
416 | 417 | ||
417 | qualmsg = (p80211msg_lnxreq_commsquality_t*) msg; | 418 | qualmsg = (p80211msg_lnxreq_commsquality_t*) msg; |
418 | 419 | ||
@@ -464,7 +465,7 @@ u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate) | |||
464 | 465 | ||
465 | result = P80211ENUM_resultcode_implementation_failure; | 466 | result = P80211ENUM_resultcode_implementation_failure; |
466 | 467 | ||
467 | WLAN_LOG_DEBUG(2, "Current MSD state(%d), requesting(%d)\n", | 468 | pr_debug("Current MSD state(%d), requesting(%d)\n", |
468 | wlandev->msdstate, ifstate); | 469 | wlandev->msdstate, ifstate); |
469 | switch (ifstate) | 470 | switch (ifstate) |
470 | { | 471 | { |
@@ -1002,7 +1003,7 @@ static int prism2sta_setmulticast(wlandevice_t *wlandev, netdevice_t *dev) | |||
1002 | ----------------------------------------------------------------*/ | 1003 | ----------------------------------------------------------------*/ |
1003 | static void prism2sta_inf_handover(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf) | 1004 | static void prism2sta_inf_handover(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf) |
1004 | { | 1005 | { |
1005 | WLAN_LOG_DEBUG(2,"received infoframe:HANDOVER (unhandled)\n"); | 1006 | pr_debug("received infoframe:HANDOVER (unhandled)\n"); |
1006 | return; | 1007 | return; |
1007 | } | 1008 | } |
1008 | 1009 | ||
@@ -1089,15 +1090,15 @@ static void prism2sta_inf_scanresults(wlandevice_t *wlandev, | |||
1089 | nbss /= sizeof(hfa384x_ScanResultSub_t); | 1090 | nbss /= sizeof(hfa384x_ScanResultSub_t); |
1090 | 1091 | ||
1091 | /* Print em */ | 1092 | /* Print em */ |
1092 | WLAN_LOG_DEBUG(1,"rx scanresults, reason=%d, nbss=%d:\n", | 1093 | pr_debug("rx scanresults, reason=%d, nbss=%d:\n", |
1093 | inf->info.scanresult.scanreason, nbss); | 1094 | inf->info.scanresult.scanreason, nbss); |
1094 | for ( i = 0; i < nbss; i++) { | 1095 | for ( i = 0; i < nbss; i++) { |
1095 | WLAN_LOG_DEBUG(1, "chid=%d anl=%d sl=%d bcnint=%d\n", | 1096 | pr_debug("chid=%d anl=%d sl=%d bcnint=%d\n", |
1096 | sr->result[i].chid, | 1097 | sr->result[i].chid, |
1097 | sr->result[i].anl, | 1098 | sr->result[i].anl, |
1098 | sr->result[i].sl, | 1099 | sr->result[i].sl, |
1099 | sr->result[i].bcnint); | 1100 | sr->result[i].bcnint); |
1100 | WLAN_LOG_DEBUG(1, " capinfo=0x%04x proberesp_rate=%d\n", | 1101 | pr_debug(" capinfo=0x%04x proberesp_rate=%d\n", |
1101 | sr->result[i].capinfo, | 1102 | sr->result[i].capinfo, |
1102 | sr->result[i].proberesp_rate); | 1103 | sr->result[i].proberesp_rate); |
1103 | } | 1104 | } |
@@ -1138,7 +1139,7 @@ static void prism2sta_inf_hostscanresults(wlandevice_t *wlandev, | |||
1138 | int nbss; | 1139 | int nbss; |
1139 | 1140 | ||
1140 | nbss = (inf->framelen - 3) / 32; | 1141 | nbss = (inf->framelen - 3) / 32; |
1141 | WLAN_LOG_DEBUG(1, "Received %d hostscan results\n", nbss); | 1142 | pr_debug("Received %d hostscan results\n", nbss); |
1142 | 1143 | ||
1143 | if (nbss > 32) | 1144 | if (nbss > 32) |
1144 | nbss = 32; | 1145 | nbss = 32; |
@@ -1191,7 +1192,7 @@ static void prism2sta_inf_chinforesults(wlandevice_t *wlandev, | |||
1191 | chinforesult->anl = hfa384x2host_16(inf->info.chinforesult.result[n].anl); | 1192 | chinforesult->anl = hfa384x2host_16(inf->info.chinforesult.result[n].anl); |
1192 | chinforesult->pnl = hfa384x2host_16(inf->info.chinforesult.result[n].pnl); | 1193 | chinforesult->pnl = hfa384x2host_16(inf->info.chinforesult.result[n].pnl); |
1193 | chinforesult->active = hfa384x2host_16(inf->info.chinforesult.result[n].active); | 1194 | chinforesult->active = hfa384x2host_16(inf->info.chinforesult.result[n].active); |
1194 | WLAN_LOG_DEBUG(2, "chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n", | 1195 | pr_debug("chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n", |
1195 | channel+1, | 1196 | channel+1, |
1196 | chinforesult->active & | 1197 | chinforesult->active & |
1197 | HFA384x_CHINFORESULT_BSSACTIVE ? "signal" : "noise", | 1198 | HFA384x_CHINFORESULT_BSSACTIVE ? "signal" : "noise", |
@@ -1276,7 +1277,7 @@ void prism2sta_processing_defer(struct work_struct *data) | |||
1276 | HFA384x_RID_CURRENTBSSID, | 1277 | HFA384x_RID_CURRENTBSSID, |
1277 | wlandev->bssid, WLAN_BSSID_LEN); | 1278 | wlandev->bssid, WLAN_BSSID_LEN); |
1278 | if ( result ) { | 1279 | if ( result ) { |
1279 | WLAN_LOG_DEBUG(1, | 1280 | pr_debug( |
1280 | "getconfig(0x%02x) failed, result = %d\n", | 1281 | "getconfig(0x%02x) failed, result = %d\n", |
1281 | HFA384x_RID_CURRENTBSSID, result); | 1282 | HFA384x_RID_CURRENTBSSID, result); |
1282 | goto failed; | 1283 | goto failed; |
@@ -1286,7 +1287,7 @@ void prism2sta_processing_defer(struct work_struct *data) | |||
1286 | HFA384x_RID_CURRENTSSID, | 1287 | HFA384x_RID_CURRENTSSID, |
1287 | &ssid, sizeof(ssid)); | 1288 | &ssid, sizeof(ssid)); |
1288 | if ( result ) { | 1289 | if ( result ) { |
1289 | WLAN_LOG_DEBUG(1, | 1290 | pr_debug( |
1290 | "getconfig(0x%02x) failed, result = %d\n", | 1291 | "getconfig(0x%02x) failed, result = %d\n", |
1291 | HFA384x_RID_CURRENTSSID, result); | 1292 | HFA384x_RID_CURRENTSSID, result); |
1292 | goto failed; | 1293 | goto failed; |
@@ -1298,7 +1299,7 @@ void prism2sta_processing_defer(struct work_struct *data) | |||
1298 | result = hfa384x_drvr_getconfig16(hw, | 1299 | result = hfa384x_drvr_getconfig16(hw, |
1299 | HFA384x_RID_PORTSTATUS, &portstatus); | 1300 | HFA384x_RID_PORTSTATUS, &portstatus); |
1300 | if ( result ) { | 1301 | if ( result ) { |
1301 | WLAN_LOG_DEBUG(1, | 1302 | pr_debug( |
1302 | "getconfig(0x%02x) failed, result = %d\n", | 1303 | "getconfig(0x%02x) failed, result = %d\n", |
1303 | HFA384x_RID_PORTSTATUS, result); | 1304 | HFA384x_RID_PORTSTATUS, result); |
1304 | goto failed; | 1305 | goto failed; |
@@ -1362,7 +1363,7 @@ void prism2sta_processing_defer(struct work_struct *data) | |||
1362 | HFA384x_RID_CURRENTBSSID, | 1363 | HFA384x_RID_CURRENTBSSID, |
1363 | wlandev->bssid, WLAN_BSSID_LEN); | 1364 | wlandev->bssid, WLAN_BSSID_LEN); |
1364 | if ( result ) { | 1365 | if ( result ) { |
1365 | WLAN_LOG_DEBUG(1, | 1366 | pr_debug( |
1366 | "getconfig(0x%02x) failed, result = %d\n", | 1367 | "getconfig(0x%02x) failed, result = %d\n", |
1367 | HFA384x_RID_CURRENTBSSID, result); | 1368 | HFA384x_RID_CURRENTBSSID, result); |
1368 | goto failed; | 1369 | goto failed; |
@@ -1372,7 +1373,7 @@ void prism2sta_processing_defer(struct work_struct *data) | |||
1372 | HFA384x_RID_CURRENTSSID, | 1373 | HFA384x_RID_CURRENTSSID, |
1373 | &ssid, sizeof(ssid)); | 1374 | &ssid, sizeof(ssid)); |
1374 | if ( result ) { | 1375 | if ( result ) { |
1375 | WLAN_LOG_DEBUG(1, | 1376 | pr_debug( |
1376 | "getconfig(0x%02x) failed, result = %d\n", | 1377 | "getconfig(0x%02x) failed, result = %d\n", |
1377 | HFA384x_RID_CURRENTSSID, result); | 1378 | HFA384x_RID_CURRENTSSID, result); |
1378 | goto failed; | 1379 | goto failed; |
@@ -1852,7 +1853,7 @@ void prism2sta_ev_info(wlandevice_t *wlandev, hfa384x_InfFrame_t *inf) | |||
1852 | ----------------------------------------------------------------*/ | 1853 | ----------------------------------------------------------------*/ |
1853 | void prism2sta_ev_txexc(wlandevice_t *wlandev, u16 status) | 1854 | void prism2sta_ev_txexc(wlandevice_t *wlandev, u16 status) |
1854 | { | 1855 | { |
1855 | WLAN_LOG_DEBUG(3, "TxExc status=0x%x.\n", status); | 1856 | pr_debug("TxExc status=0x%x.\n", status); |
1856 | 1857 | ||
1857 | return; | 1858 | return; |
1858 | } | 1859 | } |
@@ -1876,7 +1877,7 @@ void prism2sta_ev_txexc(wlandevice_t *wlandev, u16 status) | |||
1876 | ----------------------------------------------------------------*/ | 1877 | ----------------------------------------------------------------*/ |
1877 | void prism2sta_ev_tx(wlandevice_t *wlandev, u16 status) | 1878 | void prism2sta_ev_tx(wlandevice_t *wlandev, u16 status) |
1878 | { | 1879 | { |
1879 | WLAN_LOG_DEBUG(4, "Tx Complete, status=0x%04x\n", status); | 1880 | pr_debug("Tx Complete, status=0x%04x\n", status); |
1880 | /* update linux network stats */ | 1881 | /* update linux network stats */ |
1881 | wlandev->linux_stats.tx_packets++; | 1882 | wlandev->linux_stats.tx_packets++; |
1882 | return; | 1883 | return; |
@@ -2018,7 +2019,7 @@ void prism2sta_commsqual_defer(struct work_struct *data) | |||
2018 | // ASL_currBSS; // level | 2019 | // ASL_currBSS; // level |
2019 | // qual.ANL_currFC; // noise | 2020 | // qual.ANL_currFC; // noise |
2020 | 2021 | ||
2021 | WLAN_LOG_DEBUG(3, "commsqual %d %d %d\n", | 2022 | pr_debug("commsqual %d %d %d\n", |
2022 | hfa384x2host_16(hw->qual.CQ_currBSS), | 2023 | hfa384x2host_16(hw->qual.CQ_currBSS), |
2023 | hfa384x2host_16(hw->qual.ASL_currBSS), | 2024 | hfa384x2host_16(hw->qual.ASL_currBSS), |
2024 | hfa384x2host_16(hw->qual.ANL_currFC)); | 2025 | hfa384x2host_16(hw->qual.ANL_currFC)); |
@@ -2029,7 +2030,7 @@ void prism2sta_commsqual_defer(struct work_struct *data) | |||
2029 | HFA384x_RID_CURRENTBSSID, | 2030 | HFA384x_RID_CURRENTBSSID, |
2030 | wlandev->bssid, WLAN_BSSID_LEN); | 2031 | wlandev->bssid, WLAN_BSSID_LEN); |
2031 | if ( result ) { | 2032 | if ( result ) { |
2032 | WLAN_LOG_DEBUG(1, | 2033 | pr_debug( |
2033 | "getconfig(0x%02x) failed, result = %d\n", | 2034 | "getconfig(0x%02x) failed, result = %d\n", |
2034 | HFA384x_RID_CURRENTBSSID, result); | 2035 | HFA384x_RID_CURRENTBSSID, result); |
2035 | goto done; | 2036 | goto done; |
@@ -2039,7 +2040,7 @@ void prism2sta_commsqual_defer(struct work_struct *data) | |||
2039 | HFA384x_RID_CURRENTSSID, | 2040 | HFA384x_RID_CURRENTSSID, |
2040 | &ssid, sizeof(ssid)); | 2041 | &ssid, sizeof(ssid)); |
2041 | if ( result ) { | 2042 | if ( result ) { |
2042 | WLAN_LOG_DEBUG(1, | 2043 | pr_debug( |
2043 | "getconfig(0x%02x) failed, result = %d\n", | 2044 | "getconfig(0x%02x) failed, result = %d\n", |
2044 | HFA384x_RID_CURRENTSSID, result); | 2045 | HFA384x_RID_CURRENTSSID, result); |
2045 | goto done; | 2046 | goto done; |