diff options
author | Andy Shevchenko <andy.shevchenko@gmail.com> | 2010-10-16 06:11:12 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-19 13:04:17 -0400 |
commit | 2b6d83d6623dfc4ea036b62b405ce206edfcaa52 (patch) | |
tree | 1ed15bad13fdff86cfcef858873c739971cc2fa3 /drivers/staging/wlags49_h2 | |
parent | a113af9a35191901a2be532a7d70ee2dff8ad82d (diff) |
staging: wlags49_h2: remove useless DbgHwAddr() method
There is no needs to prepare string for MAC addresses beforehand, due to
kernel's *printf() have '%pM' format option.
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlags49_h2')
-rw-r--r-- | drivers/staging/wlags49_h2/wl_main.c | 73 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/wl_netdev.c | 3 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/wl_util.c | 70 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/wl_util.h | 5 | ||||
-rw-r--r-- | drivers/staging/wlags49_h2/wl_wext.c | 9 |
5 files changed, 66 insertions, 94 deletions
diff --git a/drivers/staging/wlags49_h2/wl_main.c b/drivers/staging/wlags49_h2/wl_main.c index 10a4709bcc7..00758aadb4e 100644 --- a/drivers/staging/wlags49_h2/wl_main.c +++ b/drivers/staging/wlags49_h2/wl_main.c | |||
@@ -485,7 +485,10 @@ int wl_insert( struct net_device *dev ) | |||
485 | //;? DBG_PARAM( DbgInfo, PARM_NAME_CREATE_IBSS, "\"%s\"", PARM_CREATE_IBSS ); | 485 | //;? DBG_PARAM( DbgInfo, PARM_NAME_CREATE_IBSS, "\"%s\"", PARM_CREATE_IBSS ); |
486 | //;? DBG_PARAM( DbgInfo, PARM_NAME_MULTICAST_RX, "\"%s\"", PARM_MULTICAST_RX ); | 486 | //;? DBG_PARAM( DbgInfo, PARM_NAME_MULTICAST_RX, "\"%s\"", PARM_MULTICAST_RX ); |
487 | //;? DBG_PARAM( DbgInfo, PARM_NAME_MAX_SLEEP, "%d", PARM_MAX_SLEEP ); | 487 | //;? DBG_PARAM( DbgInfo, PARM_NAME_MAX_SLEEP, "%d", PARM_MAX_SLEEP ); |
488 | //;? DBG_PARAM( DbgInfo, PARM_NAME_NETWORK_ADDR, "\"%s\"", DbgHwAddr( PARM_NETWORK_ADDR )); | 488 | /* |
489 | DBG_PARAM(DbgInfo, PARM_NAME_NETWORK_ADDR, "\"%pM\"", | ||
490 | PARM_NETWORK_ADDR); | ||
491 | */ | ||
489 | //;? DBG_PARAM( DbgInfo, PARM_NAME_AUTHENTICATION, "%d", PARM_AUTHENTICATION ); | 492 | //;? DBG_PARAM( DbgInfo, PARM_NAME_AUTHENTICATION, "%d", PARM_AUTHENTICATION ); |
490 | //;? DBG_PARAM( DbgInfo, PARM_NAME_OWN_ATIM_WINDOW, "%d", PARM_OWN_ATIM_WINDOW ); | 493 | //;? DBG_PARAM( DbgInfo, PARM_NAME_OWN_ATIM_WINDOW, "%d", PARM_OWN_ATIM_WINDOW ); |
491 | //;? DBG_PARAM( DbgInfo, PARM_NAME_PM_HOLDOVER_DURATION, "%d", PARM_PM_HOLDOVER_DURATION ); | 494 | //;? DBG_PARAM( DbgInfo, PARM_NAME_PM_HOLDOVER_DURATION, "%d", PARM_PM_HOLDOVER_DURATION ); |
@@ -512,12 +515,18 @@ int wl_insert( struct net_device *dev ) | |||
512 | DBG_PARAM( DbgInfo, PARM_NAME_TX_RATE4, "%d", PARM_TX_RATE4 ); | 515 | DBG_PARAM( DbgInfo, PARM_NAME_TX_RATE4, "%d", PARM_TX_RATE4 ); |
513 | DBG_PARAM( DbgInfo, PARM_NAME_TX_RATE5, "%d", PARM_TX_RATE5 ); | 516 | DBG_PARAM( DbgInfo, PARM_NAME_TX_RATE5, "%d", PARM_TX_RATE5 ); |
514 | DBG_PARAM( DbgInfo, PARM_NAME_TX_RATE6, "%d", PARM_TX_RATE6 ); | 517 | DBG_PARAM( DbgInfo, PARM_NAME_TX_RATE6, "%d", PARM_TX_RATE6 ); |
515 | DBG_PARAM( DbgInfo, PARM_NAME_WDS_ADDRESS1, "\"%s\"", DbgHwAddr( PARM_WDS_ADDRESS1 )); | 518 | DBG_PARAM(DbgInfo, PARM_NAME_WDS_ADDRESS1, "\"%pM\"", |
516 | DBG_PARAM( DbgInfo, PARM_NAME_WDS_ADDRESS2, "\"%s\"", DbgHwAddr( PARM_WDS_ADDRESS2 )); | 519 | PARM_WDS_ADDRESS1); |
517 | DBG_PARAM( DbgInfo, PARM_NAME_WDS_ADDRESS3, "\"%s\"", DbgHwAddr( PARM_WDS_ADDRESS3 )); | 520 | DBG_PARAM(DbgInfo, PARM_NAME_WDS_ADDRESS2, "\"%pM\"", |
518 | DBG_PARAM( DbgInfo, PARM_NAME_WDS_ADDRESS4, "\"%s\"", DbgHwAddr( PARM_WDS_ADDRESS4 )); | 521 | PARM_WDS_ADDRESS2); |
519 | DBG_PARAM( DbgInfo, PARM_NAME_WDS_ADDRESS5, "\"%s\"", DbgHwAddr( PARM_WDS_ADDRESS5 )); | 522 | DBG_PARAM(DbgInfo, PARM_NAME_WDS_ADDRESS3, "\"%pM\"", |
520 | DBG_PARAM( DbgInfo, PARM_NAME_WDS_ADDRESS6, "\"%s\"", DbgHwAddr( PARM_WDS_ADDRESS6 )); | 523 | PARM_WDS_ADDRESS3); |
524 | DBG_PARAM(DbgInfo, PARM_NAME_WDS_ADDRESS4, "\"%pM\"", | ||
525 | PARM_WDS_ADDRESS4); | ||
526 | DBG_PARAM(DbgInfo, PARM_NAME_WDS_ADDRESS5, "\"%pM\"", | ||
527 | PARM_WDS_ADDRESS5); | ||
528 | DBG_PARAM(DbgInfo, PARM_NAME_WDS_ADDRESS6, "\"%pM\"", | ||
529 | PARM_WDS_ADDRESS6); | ||
521 | #endif /* USE_WDS */ | 530 | #endif /* USE_WDS */ |
522 | #endif /* HCF_AP */ | 531 | #endif /* HCF_AP */ |
523 | 532 | ||
@@ -1189,7 +1198,7 @@ int rc; | |||
1189 | return hcf_status; | 1198 | return hcf_status; |
1190 | } | 1199 | } |
1191 | memcpy( lp->MACAddress, &lp->ltvRecord.u.u8[0], ETH_ALEN ); | 1200 | memcpy( lp->MACAddress, &lp->ltvRecord.u.u8[0], ETH_ALEN ); |
1192 | DBG_TRACE( DbgInfo, "Card MAC Address: %s\n", DbgHwAddr( lp->MACAddress )); | 1201 | DBG_TRACE(DbgInfo, "Card MAC Address: %pM\n", lp->MACAddress); |
1193 | 1202 | ||
1194 | /* Write out configuration to the device, enable, and reconnect. However, | 1203 | /* Write out configuration to the device, enable, and reconnect. However, |
1195 | only reconnect if in AP mode. For STA mode, need to wait for passive scan | 1204 | only reconnect if in AP mode. For STA mode, need to wait for passive scan |
@@ -1940,8 +1949,10 @@ int wl_put_ltv( struct wl_private *lp ) | |||
1940 | } | 1949 | } |
1941 | 1950 | ||
1942 | /* Own MAC Address */ | 1951 | /* Own MAC Address */ |
1943 | //DBG_TRACE( DbgInfo, "MAC Address : %s\n", | 1952 | /* |
1944 | // DbgHwAddr( lp->MACAddress )); | 1953 | DBG_TRACE(DbgInfo, "MAC Address : %pM\n", |
1954 | lp->MACAddress); | ||
1955 | */ | ||
1945 | 1956 | ||
1946 | if ( WVLAN_VALID_MAC_ADDRESS( lp->MACAddress )) { | 1957 | if ( WVLAN_VALID_MAC_ADDRESS( lp->MACAddress )) { |
1947 | /* Make the MAC address valid by: | 1958 | /* Make the MAC address valid by: |
@@ -3052,8 +3063,8 @@ void wl_process_mailbox( struct wl_private *lp ) | |||
3052 | aps[num_aps].capability ); | 3063 | aps[num_aps].capability ); |
3053 | DBG_TRACE( DbgInfo, "SSID Length : 0x%04x\n", | 3064 | DBG_TRACE( DbgInfo, "SSID Length : 0x%04x\n", |
3054 | aps[num_aps].ssid_len ); | 3065 | aps[num_aps].ssid_len ); |
3055 | DBG_TRACE( DbgInfo, "BSSID : %s\n", | 3066 | DBG_TRACE(DbgInfo, "BSSID : %pM\n", |
3056 | DbgHwAddr( aps[num_aps].bssid )); | 3067 | aps[num_aps].bssid); |
3057 | 3068 | ||
3058 | if ( aps[num_aps].ssid_len != 0 ) { | 3069 | if ( aps[num_aps].ssid_len != 0 ) { |
3059 | DBG_TRACE( DbgInfo, "SSID : %s.\n", | 3070 | DBG_TRACE( DbgInfo, "SSID : %s.\n", |
@@ -3112,29 +3123,29 @@ void wl_process_mailbox( struct wl_private *lp ) | |||
3112 | DBG_TRACE( DbgInfo, "(%s) durID : 0x%04x.\n", | 3123 | DBG_TRACE( DbgInfo, "(%s) durID : 0x%04x.\n", |
3113 | lp->dev->name, probe_rsp->durID ); | 3124 | lp->dev->name, probe_rsp->durID ); |
3114 | 3125 | ||
3115 | DBG_TRACE( DbgInfo, "(%s) address1 : %s\n", | 3126 | DBG_TRACE(DbgInfo, "(%s) address1 : %pM\n", |
3116 | lp->dev->name, DbgHwAddr( probe_rsp->address1 )); | 3127 | lp->dev->name, probe_rsp->address1); |
3117 | 3128 | ||
3118 | DBG_TRACE( DbgInfo, "(%s) address2 : %s\n", | 3129 | DBG_TRACE(DbgInfo, "(%s) address2 : %pM\n", |
3119 | lp->dev->name, DbgHwAddr( probe_rsp->address2 )); | 3130 | lp->dev->name, probe_rsp->address2); |
3120 | 3131 | ||
3121 | DBG_TRACE( DbgInfo, "(%s) BSSID : %s\n", | 3132 | DBG_TRACE(DbgInfo, "(%s) BSSID : %pM\n", |
3122 | lp->dev->name, DbgHwAddr( probe_rsp->BSSID )); | 3133 | lp->dev->name, probe_rsp->BSSID); |
3123 | 3134 | ||
3124 | DBG_TRACE( DbgInfo, "(%s) sequence : 0x%04x.\n", | 3135 | DBG_TRACE( DbgInfo, "(%s) sequence : 0x%04x.\n", |
3125 | lp->dev->name, probe_rsp->sequence ); | 3136 | lp->dev->name, probe_rsp->sequence ); |
3126 | 3137 | ||
3127 | DBG_TRACE( DbgInfo, "(%s) address4 : %s\n", | 3138 | DBG_TRACE(DbgInfo, "(%s) address4 : %pM\n", |
3128 | lp->dev->name, DbgHwAddr( probe_rsp->address4 )); | 3139 | lp->dev->name, probe_rsp->address4); |
3129 | 3140 | ||
3130 | DBG_TRACE( DbgInfo, "(%s) datalength : 0x%04x.\n", | 3141 | DBG_TRACE( DbgInfo, "(%s) datalength : 0x%04x.\n", |
3131 | lp->dev->name, probe_rsp->dataLength ); | 3142 | lp->dev->name, probe_rsp->dataLength ); |
3132 | 3143 | ||
3133 | DBG_TRACE( DbgInfo, "(%s) DA : %s\n", | 3144 | DBG_TRACE(DbgInfo, "(%s) DA : %pM\n", |
3134 | lp->dev->name, DbgHwAddr( probe_rsp->DA )); | 3145 | lp->dev->name, probe_rsp->DA); |
3135 | 3146 | ||
3136 | DBG_TRACE( DbgInfo, "(%s) SA : %s\n", | 3147 | DBG_TRACE(DbgInfo, "(%s) SA : %pM\n", |
3137 | lp->dev->name, DbgHwAddr( probe_rsp->SA )); | 3148 | lp->dev->name, probe_rsp->SA); |
3138 | 3149 | ||
3139 | //DBG_TRACE( DbgInfo, "(%s) lenType : 0x%04x.\n", | 3150 | //DBG_TRACE( DbgInfo, "(%s) lenType : 0x%04x.\n", |
3140 | // lp->dev->name, probe_rsp->lenType ); | 3151 | // lp->dev->name, probe_rsp->lenType ); |
@@ -3302,12 +3313,12 @@ void wl_process_mailbox( struct wl_private *lp ) | |||
3302 | break; | 3313 | break; |
3303 | } | 3314 | } |
3304 | 3315 | ||
3305 | DBG_TRACE( DbgInfo, "STA Address : %s\n", | 3316 | DBG_TRACE(DbgInfo, "STA Address : %pM\n", |
3306 | DbgHwAddr( as->staAddr )); | 3317 | as->staAddr); |
3307 | 3318 | ||
3308 | if (( as->assocStatus == 2 ) && ( as->len == 8 )) { | 3319 | if (( as->assocStatus == 2 ) && ( as->len == 8 )) { |
3309 | DBG_TRACE( DbgInfo, "Old AP Address : %s\n", | 3320 | DBG_TRACE(DbgInfo, "Old AP Address : %pM\n", |
3310 | DbgHwAddr( as->oldApAddr )); | 3321 | as->oldApAddr); |
3311 | } | 3322 | } |
3312 | } | 3323 | } |
3313 | 3324 | ||
@@ -3346,9 +3357,11 @@ void wl_process_mailbox( struct wl_private *lp ) | |||
3346 | break; | 3357 | break; |
3347 | } | 3358 | } |
3348 | 3359 | ||
3349 | DBG_TRACE( DbgInfo, "STA Address : %s\n", DbgHwAddr( ss->staAddr )); | 3360 | DBG_TRACE(DbgInfo, "STA Address : %pM\n", |
3361 | ss->staAddr); | ||
3350 | 3362 | ||
3351 | DBG_TRACE( DbgInfo, "Reason : 0x%04x \n", ss->reason ); | 3363 | DBG_TRACE(DbgInfo, "Reason : 0x%04x\n", |
3364 | ss->reason); | ||
3352 | } | 3365 | } |
3353 | 3366 | ||
3354 | break; | 3367 | break; |
diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c index 954becee40d..cf917e613f2 100644 --- a/drivers/staging/wlags49_h2/wl_netdev.c +++ b/drivers/staging/wlags49_h2/wl_netdev.c | |||
@@ -1071,8 +1071,7 @@ void wl_multicast( struct net_device *dev ) | |||
1071 | DBG_PRINT( " mc_count: %d\n", netdev_mc_count(dev)); | 1071 | DBG_PRINT( " mc_count: %d\n", netdev_mc_count(dev)); |
1072 | 1072 | ||
1073 | netdev_for_each_mc_addr(ha, dev) | 1073 | netdev_for_each_mc_addr(ha, dev) |
1074 | DBG_PRINT(" %s (%d)\n", DbgHwAddr(ha->addr), | 1074 | DBG_PRINT(" %pM (%d)\n", ha->addr, dev->addr_len); |
1075 | dev->addr_len); | ||
1076 | } | 1075 | } |
1077 | #endif /* DBG */ | 1076 | #endif /* DBG */ |
1078 | 1077 | ||
diff --git a/drivers/staging/wlags49_h2/wl_util.c b/drivers/staging/wlags49_h2/wl_util.c index 4521c9fd5bb..3b6f5a59b2b 100644 --- a/drivers/staging/wlags49_h2/wl_util.c +++ b/drivers/staging/wlags49_h2/wl_util.c | |||
@@ -315,40 +315,6 @@ void key_string2key( char *ks, KEY_STRCT *key ) | |||
315 | 315 | ||
316 | 316 | ||
317 | 317 | ||
318 | #if DBG | ||
319 | /******************************************************************************* | ||
320 | * DbgHwAddr() | ||
321 | ******************************************************************************* | ||
322 | * | ||
323 | * DESCRIPTION: | ||
324 | * | ||
325 | * Convert a hardware ethernet address to a character string | ||
326 | * | ||
327 | * PARAMETERS: | ||
328 | * | ||
329 | * hwAddr - an ethernet address | ||
330 | * | ||
331 | * RETURNS: | ||
332 | * | ||
333 | * a pointer to a string representing the ethernet address | ||
334 | * | ||
335 | ******************************************************************************/ | ||
336 | const char *DbgHwAddr(unsigned char *hwAddr) | ||
337 | { | ||
338 | static char buffer[18]; | ||
339 | /*------------------------------------------------------------------------*/ | ||
340 | |||
341 | sprintf(buffer, "%pM", hwAddr); | ||
342 | |||
343 | return buffer; | ||
344 | } // DbgHwAddr | ||
345 | /*============================================================================*/ | ||
346 | |||
347 | #endif /* DBG */ | ||
348 | |||
349 | |||
350 | |||
351 | |||
352 | /******************************************************************************* | 318 | /******************************************************************************* |
353 | * wl_has_wep() | 319 | * wl_has_wep() |
354 | ******************************************************************************* | 320 | ******************************************************************************* |
@@ -1132,29 +1098,29 @@ void wl_process_probe_response( struct wl_private *lp ) | |||
1132 | DBG_TRACE( DbgInfo, "(%s) durID : 0x%04x.\n", lp->dev->name, | 1098 | DBG_TRACE( DbgInfo, "(%s) durID : 0x%04x.\n", lp->dev->name, |
1133 | probe_rsp->durID ); | 1099 | probe_rsp->durID ); |
1134 | 1100 | ||
1135 | DBG_TRACE( DbgInfo, "(%s) address1 : %s\n", lp->dev->name, | 1101 | DBG_TRACE(DbgInfo, "(%s) address1 : %pM\n", lp->dev->name, |
1136 | DbgHwAddr( probe_rsp->address1 )); | 1102 | probe_rsp->address1); |
1137 | 1103 | ||
1138 | DBG_TRACE( DbgInfo, "(%s) address2 : %s\n", lp->dev->name, | 1104 | DBG_TRACE(DbgInfo, "(%s) address2 : %pM\n", lp->dev->name, |
1139 | DbgHwAddr( probe_rsp->address2 )); | 1105 | probe_rsp->address2); |
1140 | 1106 | ||
1141 | DBG_TRACE( DbgInfo, "(%s) BSSID : %s\n", lp->dev->name, | 1107 | DBG_TRACE(DbgInfo, "(%s) BSSID : %pM\n", lp->dev->name, |
1142 | DbgHwAddr( probe_rsp->BSSID )); | 1108 | probe_rsp->BSSID); |
1143 | 1109 | ||
1144 | DBG_TRACE( DbgInfo, "(%s) sequence : 0x%04x.\n", lp->dev->name, | 1110 | DBG_TRACE( DbgInfo, "(%s) sequence : 0x%04x.\n", lp->dev->name, |
1145 | probe_rsp->sequence ); | 1111 | probe_rsp->sequence ); |
1146 | 1112 | ||
1147 | DBG_TRACE( DbgInfo, "(%s) address4 : %s\n", lp->dev->name, | 1113 | DBG_TRACE(DbgInfo, "(%s) address4 : %pM\n", lp->dev->name, |
1148 | DbgHwAddr( probe_rsp->address4 )); | 1114 | probe_rsp->address4); |
1149 | 1115 | ||
1150 | DBG_TRACE( DbgInfo, "(%s) datalength : 0x%04x.\n", lp->dev->name, | 1116 | DBG_TRACE( DbgInfo, "(%s) datalength : 0x%04x.\n", lp->dev->name, |
1151 | probe_rsp->dataLength ); | 1117 | probe_rsp->dataLength ); |
1152 | 1118 | ||
1153 | DBG_TRACE( DbgInfo, "(%s) DA : %s\n", lp->dev->name, | 1119 | DBG_TRACE(DbgInfo, "(%s) DA : %pM\n", lp->dev->name, |
1154 | DbgHwAddr( probe_rsp->DA )); | 1120 | probe_rsp->DA); |
1155 | 1121 | ||
1156 | DBG_TRACE( DbgInfo, "(%s) SA : %s\n", lp->dev->name, | 1122 | DBG_TRACE(DbgInfo, "(%s) SA : %pM\n", lp->dev->name, |
1157 | DbgHwAddr( probe_rsp->SA )); | 1123 | probe_rsp->SA); |
1158 | 1124 | ||
1159 | #ifdef WARP | 1125 | #ifdef WARP |
1160 | 1126 | ||
@@ -1382,12 +1348,11 @@ void wl_process_assoc_status( struct wl_private *lp ) | |||
1382 | break; | 1348 | break; |
1383 | } | 1349 | } |
1384 | 1350 | ||
1385 | DBG_TRACE( DbgInfo, "STA Address : %s\n", | 1351 | DBG_TRACE(DbgInfo, "STA Address : %pM\n", assoc_stat->staAddr); |
1386 | DbgHwAddr( assoc_stat->staAddr )); | ||
1387 | 1352 | ||
1388 | if(( assoc_stat->assocStatus == 2 ) && ( assoc_stat->len == 8 )) { | 1353 | if(( assoc_stat->assocStatus == 2 ) && ( assoc_stat->len == 8 )) { |
1389 | DBG_TRACE( DbgInfo, "Old AP Address : %s\n", | 1354 | DBG_TRACE(DbgInfo, "Old AP Address : %pM\n", |
1390 | DbgHwAddr( assoc_stat->oldApAddr )); | 1355 | assoc_stat->oldApAddr); |
1391 | } | 1356 | } |
1392 | } | 1357 | } |
1393 | 1358 | ||
@@ -1458,9 +1423,8 @@ void wl_process_security_status( struct wl_private *lp ) | |||
1458 | break; | 1423 | break; |
1459 | } | 1424 | } |
1460 | 1425 | ||
1461 | DBG_TRACE( DbgInfo, "STA Address : %s\n", | 1426 | DBG_TRACE(DbgInfo, "STA Address : %pM\n", sec_stat->staAddr); |
1462 | DbgHwAddr( sec_stat->staAddr )); | 1427 | DBG_TRACE(DbgInfo, "Reason : 0x%04x\n", sec_stat->reason); |
1463 | DBG_TRACE( DbgInfo, "Reason : 0x%04x \n", sec_stat->reason ); | ||
1464 | 1428 | ||
1465 | } | 1429 | } |
1466 | 1430 | ||
diff --git a/drivers/staging/wlags49_h2/wl_util.h b/drivers/staging/wlags49_h2/wl_util.h index ba537a60059..2661bcd6b0e 100644 --- a/drivers/staging/wlags49_h2/wl_util.h +++ b/drivers/staging/wlags49_h2/wl_util.h | |||
@@ -77,11 +77,6 @@ void wl_endian_translate_event( ltv_t *pLtv ); | |||
77 | 77 | ||
78 | int wl_has_wep( IFBP ifbp ); | 78 | int wl_has_wep( IFBP ifbp ); |
79 | 79 | ||
80 | |||
81 | #if DBG | ||
82 | const char *DbgHwAddr( unsigned char *hwAddr ); | ||
83 | #endif // DBG | ||
84 | |||
85 | hcf_8 wl_parse_ds_ie( PROBE_RESP *probe_rsp ); | 80 | hcf_8 wl_parse_ds_ie( PROBE_RESP *probe_rsp ); |
86 | hcf_8 * wl_parse_wpa_ie( PROBE_RESP *probe_rsp, hcf_16 *length ); | 81 | hcf_8 * wl_parse_wpa_ie( PROBE_RESP *probe_rsp, hcf_16 *length ); |
87 | hcf_8 * wl_print_wpa_ie( hcf_8 *buffer, int length ); | 82 | hcf_8 * wl_print_wpa_ie( hcf_8 *buffer, int length ); |
diff --git a/drivers/staging/wlags49_h2/wl_wext.c b/drivers/staging/wlags49_h2/wl_wext.c index 06467f1bf90..9e5da081537 100644 --- a/drivers/staging/wlags49_h2/wl_wext.c +++ b/drivers/staging/wlags49_h2/wl_wext.c | |||
@@ -789,7 +789,8 @@ static int wireless_get_ap_list (struct net_device *dev, struct iw_request_info | |||
789 | memcpy( hwa[count].sa_data, | 789 | memcpy( hwa[count].sa_data, |
790 | (*p)/*lp->scan_results*/.APTable[count].bssid, ETH_ALEN ); | 790 | (*p)/*lp->scan_results*/.APTable[count].bssid, ETH_ALEN ); |
791 | #else //;?why use BSSID and bssid as names in seemingly very comparable situations | 791 | #else //;?why use BSSID and bssid as names in seemingly very comparable situations |
792 | DBG_PRINT( "BSSID: %s\n", DbgHwAddr( (*p)/*lp->probe_results*/.ProbeTable[count].BSSID )); | 792 | DBG_PRINT("BSSID: %pM\n", |
793 | (*p).ProbeTable[count].BSSID); | ||
793 | memcpy( hwa[count].sa_data, | 794 | memcpy( hwa[count].sa_data, |
794 | (*p)/*lp->probe_results*/.ProbeTable[count].BSSID, ETH_ALEN ); | 795 | (*p)/*lp->probe_results*/.ProbeTable[count].BSSID, ETH_ALEN ); |
795 | #endif // WARP | 796 | #endif // WARP |
@@ -3937,9 +3938,9 @@ void wl_wext_event_mic_failed( struct net_device *dev ) | |||
3937 | a problem in future versions of the supplicant, if they ever | 3938 | a problem in future versions of the supplicant, if they ever |
3938 | actually parse these parameters */ | 3939 | actually parse these parameters */ |
3939 | #if DBG | 3940 | #if DBG |
3940 | sprintf( msg, "MLME-MICHAELMICFAILURE.indication(keyid=%d %scast addr=" | 3941 | sprintf(msg, "MLME-MICHAELMICFAILURE.indication(keyid=%d %scast " |
3941 | "%s)", key_idx, addr1[0] & 0x01 ? "broad" : "uni", | 3942 | "addr=%pM)", key_idx, addr1[0] & 0x01 ? "broad" : "uni", |
3942 | DbgHwAddr( addr2 )); | 3943 | addr2); |
3943 | #endif | 3944 | #endif |
3944 | wrqu.data.length = strlen( msg ); | 3945 | wrqu.data.length = strlen( msg ); |
3945 | wireless_send_event( dev, IWEVCUSTOM, &wrqu, msg ); | 3946 | wireless_send_event( dev, IWEVCUSTOM, &wrqu, msg ); |