diff options
Diffstat (limited to 'net/mac80211/driver-trace.h')
| -rw-r--r-- | net/mac80211/driver-trace.h | 210 |
1 files changed, 119 insertions, 91 deletions
diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h index 6a9b2342a9c2..5d5d2a974668 100644 --- a/net/mac80211/driver-trace.h +++ b/net/mac80211/driver-trace.h | |||
| @@ -36,20 +36,58 @@ static inline void trace_ ## name(proto) {} | |||
| 36 | * Tracing for driver callbacks. | 36 | * Tracing for driver callbacks. |
| 37 | */ | 37 | */ |
| 38 | 38 | ||
| 39 | TRACE_EVENT(drv_start, | 39 | TRACE_EVENT(drv_return_void, |
| 40 | TP_PROTO(struct ieee80211_local *local, int ret), | 40 | TP_PROTO(struct ieee80211_local *local), |
| 41 | TP_ARGS(local), | ||
| 42 | TP_STRUCT__entry( | ||
| 43 | LOCAL_ENTRY | ||
| 44 | ), | ||
| 45 | TP_fast_assign( | ||
| 46 | LOCAL_ASSIGN; | ||
| 47 | ), | ||
| 48 | TP_printk(LOCAL_PR_FMT, LOCAL_PR_ARG) | ||
| 49 | ); | ||
| 41 | 50 | ||
| 51 | TRACE_EVENT(drv_return_int, | ||
| 52 | TP_PROTO(struct ieee80211_local *local, int ret), | ||
| 42 | TP_ARGS(local, ret), | 53 | TP_ARGS(local, ret), |
| 43 | |||
| 44 | TP_STRUCT__entry( | 54 | TP_STRUCT__entry( |
| 45 | LOCAL_ENTRY | 55 | LOCAL_ENTRY |
| 46 | __field(int, ret) | 56 | __field(int, ret) |
| 47 | ), | 57 | ), |
| 58 | TP_fast_assign( | ||
| 59 | LOCAL_ASSIGN; | ||
| 60 | __entry->ret = ret; | ||
| 61 | ), | ||
| 62 | TP_printk(LOCAL_PR_FMT " - %d", LOCAL_PR_ARG, __entry->ret) | ||
| 63 | ); | ||
| 48 | 64 | ||
| 65 | TRACE_EVENT(drv_return_u64, | ||
| 66 | TP_PROTO(struct ieee80211_local *local, u64 ret), | ||
| 67 | TP_ARGS(local, ret), | ||
| 68 | TP_STRUCT__entry( | ||
| 69 | LOCAL_ENTRY | ||
| 70 | __field(u64, ret) | ||
| 71 | ), | ||
| 49 | TP_fast_assign( | 72 | TP_fast_assign( |
| 50 | LOCAL_ASSIGN; | 73 | LOCAL_ASSIGN; |
| 51 | __entry->ret = ret; | 74 | __entry->ret = ret; |
| 52 | ), | 75 | ), |
| 76 | TP_printk(LOCAL_PR_FMT " - %llu", LOCAL_PR_ARG, __entry->ret) | ||
| 77 | ); | ||
| 78 | |||
| 79 | TRACE_EVENT(drv_start, | ||
| 80 | TP_PROTO(struct ieee80211_local *local), | ||
| 81 | |||
| 82 | TP_ARGS(local), | ||
| 83 | |||
| 84 | TP_STRUCT__entry( | ||
| 85 | LOCAL_ENTRY | ||
| 86 | ), | ||
| 87 | |||
| 88 | TP_fast_assign( | ||
| 89 | LOCAL_ASSIGN; | ||
| 90 | ), | ||
| 53 | 91 | ||
| 54 | TP_printk( | 92 | TP_printk( |
| 55 | LOCAL_PR_FMT, LOCAL_PR_ARG | 93 | LOCAL_PR_FMT, LOCAL_PR_ARG |
| @@ -76,28 +114,25 @@ TRACE_EVENT(drv_stop, | |||
| 76 | 114 | ||
| 77 | TRACE_EVENT(drv_add_interface, | 115 | TRACE_EVENT(drv_add_interface, |
| 78 | TP_PROTO(struct ieee80211_local *local, | 116 | TP_PROTO(struct ieee80211_local *local, |
| 79 | struct ieee80211_sub_if_data *sdata, | 117 | struct ieee80211_sub_if_data *sdata), |
| 80 | int ret), | ||
| 81 | 118 | ||
| 82 | TP_ARGS(local, sdata, ret), | 119 | TP_ARGS(local, sdata), |
| 83 | 120 | ||
| 84 | TP_STRUCT__entry( | 121 | TP_STRUCT__entry( |
| 85 | LOCAL_ENTRY | 122 | LOCAL_ENTRY |
| 86 | VIF_ENTRY | 123 | VIF_ENTRY |
| 87 | __array(char, addr, 6) | 124 | __array(char, addr, 6) |
| 88 | __field(int, ret) | ||
| 89 | ), | 125 | ), |
| 90 | 126 | ||
| 91 | TP_fast_assign( | 127 | TP_fast_assign( |
| 92 | LOCAL_ASSIGN; | 128 | LOCAL_ASSIGN; |
| 93 | VIF_ASSIGN; | 129 | VIF_ASSIGN; |
| 94 | memcpy(__entry->addr, sdata->vif.addr, 6); | 130 | memcpy(__entry->addr, sdata->vif.addr, 6); |
| 95 | __entry->ret = ret; | ||
| 96 | ), | 131 | ), |
| 97 | 132 | ||
| 98 | TP_printk( | 133 | TP_printk( |
| 99 | LOCAL_PR_FMT VIF_PR_FMT " addr:%pM ret:%d", | 134 | LOCAL_PR_FMT VIF_PR_FMT " addr:%pM", |
| 100 | LOCAL_PR_ARG, VIF_PR_ARG, __entry->addr, __entry->ret | 135 | LOCAL_PR_ARG, VIF_PR_ARG, __entry->addr |
| 101 | ) | 136 | ) |
| 102 | ); | 137 | ); |
| 103 | 138 | ||
| @@ -126,15 +161,13 @@ TRACE_EVENT(drv_remove_interface, | |||
| 126 | 161 | ||
| 127 | TRACE_EVENT(drv_config, | 162 | TRACE_EVENT(drv_config, |
| 128 | TP_PROTO(struct ieee80211_local *local, | 163 | TP_PROTO(struct ieee80211_local *local, |
| 129 | u32 changed, | 164 | u32 changed), |
| 130 | int ret), | ||
| 131 | 165 | ||
| 132 | TP_ARGS(local, changed, ret), | 166 | TP_ARGS(local, changed), |
| 133 | 167 | ||
| 134 | TP_STRUCT__entry( | 168 | TP_STRUCT__entry( |
| 135 | LOCAL_ENTRY | 169 | LOCAL_ENTRY |
| 136 | __field(u32, changed) | 170 | __field(u32, changed) |
| 137 | __field(int, ret) | ||
| 138 | __field(u32, flags) | 171 | __field(u32, flags) |
| 139 | __field(int, power_level) | 172 | __field(int, power_level) |
| 140 | __field(int, dynamic_ps_timeout) | 173 | __field(int, dynamic_ps_timeout) |
| @@ -150,7 +183,6 @@ TRACE_EVENT(drv_config, | |||
| 150 | TP_fast_assign( | 183 | TP_fast_assign( |
| 151 | LOCAL_ASSIGN; | 184 | LOCAL_ASSIGN; |
| 152 | __entry->changed = changed; | 185 | __entry->changed = changed; |
| 153 | __entry->ret = ret; | ||
| 154 | __entry->flags = local->hw.conf.flags; | 186 | __entry->flags = local->hw.conf.flags; |
| 155 | __entry->power_level = local->hw.conf.power_level; | 187 | __entry->power_level = local->hw.conf.power_level; |
| 156 | __entry->dynamic_ps_timeout = local->hw.conf.dynamic_ps_timeout; | 188 | __entry->dynamic_ps_timeout = local->hw.conf.dynamic_ps_timeout; |
| @@ -164,8 +196,8 @@ TRACE_EVENT(drv_config, | |||
| 164 | ), | 196 | ), |
| 165 | 197 | ||
| 166 | TP_printk( | 198 | TP_printk( |
| 167 | LOCAL_PR_FMT " ch:%#x freq:%d ret:%d", | 199 | LOCAL_PR_FMT " ch:%#x freq:%d", |
| 168 | LOCAL_PR_ARG, __entry->changed, __entry->center_freq, __entry->ret | 200 | LOCAL_PR_ARG, __entry->changed, __entry->center_freq |
| 169 | ) | 201 | ) |
| 170 | ); | 202 | ); |
| 171 | 203 | ||
| @@ -220,26 +252,23 @@ TRACE_EVENT(drv_bss_info_changed, | |||
| 220 | ); | 252 | ); |
| 221 | 253 | ||
| 222 | TRACE_EVENT(drv_prepare_multicast, | 254 | TRACE_EVENT(drv_prepare_multicast, |
| 223 | TP_PROTO(struct ieee80211_local *local, int mc_count, u64 ret), | 255 | TP_PROTO(struct ieee80211_local *local, int mc_count), |
| 224 | 256 | ||
| 225 | TP_ARGS(local, mc_count, ret), | 257 | TP_ARGS(local, mc_count), |
| 226 | 258 | ||
| 227 | TP_STRUCT__entry( | 259 | TP_STRUCT__entry( |
| 228 | LOCAL_ENTRY | 260 | LOCAL_ENTRY |
| 229 | __field(int, mc_count) | 261 | __field(int, mc_count) |
| 230 | __field(u64, ret) | ||
| 231 | ), | 262 | ), |
| 232 | 263 | ||
| 233 | TP_fast_assign( | 264 | TP_fast_assign( |
| 234 | LOCAL_ASSIGN; | 265 | LOCAL_ASSIGN; |
| 235 | __entry->mc_count = mc_count; | 266 | __entry->mc_count = mc_count; |
| 236 | __entry->ret = ret; | ||
| 237 | ), | 267 | ), |
| 238 | 268 | ||
| 239 | TP_printk( | 269 | TP_printk( |
| 240 | LOCAL_PR_FMT " prepare mc (%d): %llx", | 270 | LOCAL_PR_FMT " prepare mc (%d)", |
| 241 | LOCAL_PR_ARG, __entry->mc_count, | 271 | LOCAL_PR_ARG, __entry->mc_count |
| 242 | (unsigned long long) __entry->ret | ||
| 243 | ) | 272 | ) |
| 244 | ); | 273 | ); |
| 245 | 274 | ||
| @@ -273,27 +302,25 @@ TRACE_EVENT(drv_configure_filter, | |||
| 273 | 302 | ||
| 274 | TRACE_EVENT(drv_set_tim, | 303 | TRACE_EVENT(drv_set_tim, |
| 275 | TP_PROTO(struct ieee80211_local *local, | 304 | TP_PROTO(struct ieee80211_local *local, |
| 276 | struct ieee80211_sta *sta, bool set, int ret), | 305 | struct ieee80211_sta *sta, bool set), |
| 277 | 306 | ||
| 278 | TP_ARGS(local, sta, set, ret), | 307 | TP_ARGS(local, sta, set), |
| 279 | 308 | ||
| 280 | TP_STRUCT__entry( | 309 | TP_STRUCT__entry( |
| 281 | LOCAL_ENTRY | 310 | LOCAL_ENTRY |
| 282 | STA_ENTRY | 311 | STA_ENTRY |
| 283 | __field(bool, set) | 312 | __field(bool, set) |
| 284 | __field(int, ret) | ||
| 285 | ), | 313 | ), |
| 286 | 314 | ||
| 287 | TP_fast_assign( | 315 | TP_fast_assign( |
| 288 | LOCAL_ASSIGN; | 316 | LOCAL_ASSIGN; |
| 289 | STA_ASSIGN; | 317 | STA_ASSIGN; |
| 290 | __entry->set = set; | 318 | __entry->set = set; |
| 291 | __entry->ret = ret; | ||
| 292 | ), | 319 | ), |
| 293 | 320 | ||
| 294 | TP_printk( | 321 | TP_printk( |
| 295 | LOCAL_PR_FMT STA_PR_FMT " set:%d ret:%d", | 322 | LOCAL_PR_FMT STA_PR_FMT " set:%d", |
| 296 | LOCAL_PR_ARG, STA_PR_FMT, __entry->set, __entry->ret | 323 | LOCAL_PR_ARG, STA_PR_FMT, __entry->set |
| 297 | ) | 324 | ) |
| 298 | ); | 325 | ); |
| 299 | 326 | ||
| @@ -301,9 +328,9 @@ TRACE_EVENT(drv_set_key, | |||
| 301 | TP_PROTO(struct ieee80211_local *local, | 328 | TP_PROTO(struct ieee80211_local *local, |
| 302 | enum set_key_cmd cmd, struct ieee80211_sub_if_data *sdata, | 329 | enum set_key_cmd cmd, struct ieee80211_sub_if_data *sdata, |
| 303 | struct ieee80211_sta *sta, | 330 | struct ieee80211_sta *sta, |
| 304 | struct ieee80211_key_conf *key, int ret), | 331 | struct ieee80211_key_conf *key), |
| 305 | 332 | ||
| 306 | TP_ARGS(local, cmd, sdata, sta, key, ret), | 333 | TP_ARGS(local, cmd, sdata, sta, key), |
| 307 | 334 | ||
| 308 | TP_STRUCT__entry( | 335 | TP_STRUCT__entry( |
| 309 | LOCAL_ENTRY | 336 | LOCAL_ENTRY |
| @@ -313,7 +340,6 @@ TRACE_EVENT(drv_set_key, | |||
| 313 | __field(u8, hw_key_idx) | 340 | __field(u8, hw_key_idx) |
| 314 | __field(u8, flags) | 341 | __field(u8, flags) |
| 315 | __field(s8, keyidx) | 342 | __field(s8, keyidx) |
| 316 | __field(int, ret) | ||
| 317 | ), | 343 | ), |
| 318 | 344 | ||
| 319 | TP_fast_assign( | 345 | TP_fast_assign( |
| @@ -324,12 +350,11 @@ TRACE_EVENT(drv_set_key, | |||
| 324 | __entry->flags = key->flags; | 350 | __entry->flags = key->flags; |
| 325 | __entry->keyidx = key->keyidx; | 351 | __entry->keyidx = key->keyidx; |
| 326 | __entry->hw_key_idx = key->hw_key_idx; | 352 | __entry->hw_key_idx = key->hw_key_idx; |
| 327 | __entry->ret = ret; | ||
| 328 | ), | 353 | ), |
| 329 | 354 | ||
| 330 | TP_printk( | 355 | TP_printk( |
| 331 | LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " ret:%d", | 356 | LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT, |
| 332 | LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->ret | 357 | LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG |
| 333 | ) | 358 | ) |
| 334 | ); | 359 | ); |
| 335 | 360 | ||
| @@ -364,25 +389,23 @@ TRACE_EVENT(drv_update_tkip_key, | |||
| 364 | TRACE_EVENT(drv_hw_scan, | 389 | TRACE_EVENT(drv_hw_scan, |
| 365 | TP_PROTO(struct ieee80211_local *local, | 390 | TP_PROTO(struct ieee80211_local *local, |
| 366 | struct ieee80211_sub_if_data *sdata, | 391 | struct ieee80211_sub_if_data *sdata, |
| 367 | struct cfg80211_scan_request *req, int ret), | 392 | struct cfg80211_scan_request *req), |
| 368 | 393 | ||
| 369 | TP_ARGS(local, sdata, req, ret), | 394 | TP_ARGS(local, sdata, req), |
| 370 | 395 | ||
| 371 | TP_STRUCT__entry( | 396 | TP_STRUCT__entry( |
| 372 | LOCAL_ENTRY | 397 | LOCAL_ENTRY |
| 373 | VIF_ENTRY | 398 | VIF_ENTRY |
| 374 | __field(int, ret) | ||
| 375 | ), | 399 | ), |
| 376 | 400 | ||
| 377 | TP_fast_assign( | 401 | TP_fast_assign( |
| 378 | LOCAL_ASSIGN; | 402 | LOCAL_ASSIGN; |
| 379 | VIF_ASSIGN; | 403 | VIF_ASSIGN; |
| 380 | __entry->ret = ret; | ||
| 381 | ), | 404 | ), |
| 382 | 405 | ||
| 383 | TP_printk( | 406 | TP_printk( |
| 384 | LOCAL_PR_FMT VIF_PR_FMT " ret:%d", | 407 | LOCAL_PR_FMT VIF_PR_FMT, |
| 385 | LOCAL_PR_ARG,VIF_PR_ARG, __entry->ret | 408 | LOCAL_PR_ARG,VIF_PR_ARG |
| 386 | ) | 409 | ) |
| 387 | ); | 410 | ); |
| 388 | 411 | ||
| @@ -479,48 +502,44 @@ TRACE_EVENT(drv_get_tkip_seq, | |||
| 479 | ); | 502 | ); |
| 480 | 503 | ||
| 481 | TRACE_EVENT(drv_set_rts_threshold, | 504 | TRACE_EVENT(drv_set_rts_threshold, |
| 482 | TP_PROTO(struct ieee80211_local *local, u32 value, int ret), | 505 | TP_PROTO(struct ieee80211_local *local, u32 value), |
| 483 | 506 | ||
| 484 | TP_ARGS(local, value, ret), | 507 | TP_ARGS(local, value), |
| 485 | 508 | ||
| 486 | TP_STRUCT__entry( | 509 | TP_STRUCT__entry( |
| 487 | LOCAL_ENTRY | 510 | LOCAL_ENTRY |
| 488 | __field(u32, value) | 511 | __field(u32, value) |
| 489 | __field(int, ret) | ||
| 490 | ), | 512 | ), |
| 491 | 513 | ||
| 492 | TP_fast_assign( | 514 | TP_fast_assign( |
| 493 | LOCAL_ASSIGN; | 515 | LOCAL_ASSIGN; |
| 494 | __entry->ret = ret; | ||
| 495 | __entry->value = value; | 516 | __entry->value = value; |
| 496 | ), | 517 | ), |
| 497 | 518 | ||
| 498 | TP_printk( | 519 | TP_printk( |
| 499 | LOCAL_PR_FMT " value:%d ret:%d", | 520 | LOCAL_PR_FMT " value:%d", |
| 500 | LOCAL_PR_ARG, __entry->value, __entry->ret | 521 | LOCAL_PR_ARG, __entry->value |
| 501 | ) | 522 | ) |
| 502 | ); | 523 | ); |
| 503 | 524 | ||
| 504 | TRACE_EVENT(drv_set_coverage_class, | 525 | TRACE_EVENT(drv_set_coverage_class, |
| 505 | TP_PROTO(struct ieee80211_local *local, u8 value, int ret), | 526 | TP_PROTO(struct ieee80211_local *local, u8 value), |
| 506 | 527 | ||
| 507 | TP_ARGS(local, value, ret), | 528 | TP_ARGS(local, value), |
| 508 | 529 | ||
| 509 | TP_STRUCT__entry( | 530 | TP_STRUCT__entry( |
| 510 | LOCAL_ENTRY | 531 | LOCAL_ENTRY |
| 511 | __field(u8, value) | 532 | __field(u8, value) |
| 512 | __field(int, ret) | ||
| 513 | ), | 533 | ), |
| 514 | 534 | ||
| 515 | TP_fast_assign( | 535 | TP_fast_assign( |
| 516 | LOCAL_ASSIGN; | 536 | LOCAL_ASSIGN; |
| 517 | __entry->ret = ret; | ||
| 518 | __entry->value = value; | 537 | __entry->value = value; |
| 519 | ), | 538 | ), |
| 520 | 539 | ||
| 521 | TP_printk( | 540 | TP_printk( |
| 522 | LOCAL_PR_FMT " value:%d ret:%d", | 541 | LOCAL_PR_FMT " value:%d", |
| 523 | LOCAL_PR_ARG, __entry->value, __entry->ret | 542 | LOCAL_PR_ARG, __entry->value |
| 524 | ) | 543 | ) |
| 525 | ); | 544 | ); |
| 526 | 545 | ||
| @@ -555,27 +574,25 @@ TRACE_EVENT(drv_sta_notify, | |||
| 555 | TRACE_EVENT(drv_sta_add, | 574 | TRACE_EVENT(drv_sta_add, |
| 556 | TP_PROTO(struct ieee80211_local *local, | 575 | TP_PROTO(struct ieee80211_local *local, |
| 557 | struct ieee80211_sub_if_data *sdata, | 576 | struct ieee80211_sub_if_data *sdata, |
| 558 | struct ieee80211_sta *sta, int ret), | 577 | struct ieee80211_sta *sta), |
| 559 | 578 | ||
| 560 | TP_ARGS(local, sdata, sta, ret), | 579 | TP_ARGS(local, sdata, sta), |
| 561 | 580 | ||
| 562 | TP_STRUCT__entry( | 581 | TP_STRUCT__entry( |
| 563 | LOCAL_ENTRY | 582 | LOCAL_ENTRY |
| 564 | VIF_ENTRY | 583 | VIF_ENTRY |
| 565 | STA_ENTRY | 584 | STA_ENTRY |
| 566 | __field(int, ret) | ||
| 567 | ), | 585 | ), |
| 568 | 586 | ||
| 569 | TP_fast_assign( | 587 | TP_fast_assign( |
| 570 | LOCAL_ASSIGN; | 588 | LOCAL_ASSIGN; |
| 571 | VIF_ASSIGN; | 589 | VIF_ASSIGN; |
| 572 | STA_ASSIGN; | 590 | STA_ASSIGN; |
| 573 | __entry->ret = ret; | ||
| 574 | ), | 591 | ), |
| 575 | 592 | ||
| 576 | TP_printk( | 593 | TP_printk( |
| 577 | LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " ret:%d", | 594 | LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT, |
| 578 | LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->ret | 595 | LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG |
| 579 | ) | 596 | ) |
| 580 | ); | 597 | ); |
| 581 | 598 | ||
| @@ -606,10 +623,9 @@ TRACE_EVENT(drv_sta_remove, | |||
| 606 | 623 | ||
| 607 | TRACE_EVENT(drv_conf_tx, | 624 | TRACE_EVENT(drv_conf_tx, |
| 608 | TP_PROTO(struct ieee80211_local *local, u16 queue, | 625 | TP_PROTO(struct ieee80211_local *local, u16 queue, |
| 609 | const struct ieee80211_tx_queue_params *params, | 626 | const struct ieee80211_tx_queue_params *params), |
| 610 | int ret), | ||
| 611 | 627 | ||
| 612 | TP_ARGS(local, queue, params, ret), | 628 | TP_ARGS(local, queue, params), |
| 613 | 629 | ||
| 614 | TP_STRUCT__entry( | 630 | TP_STRUCT__entry( |
| 615 | LOCAL_ENTRY | 631 | LOCAL_ENTRY |
| @@ -618,13 +634,11 @@ TRACE_EVENT(drv_conf_tx, | |||
| 618 | __field(u16, cw_min) | 634 | __field(u16, cw_min) |
| 619 | __field(u16, cw_max) | 635 | __field(u16, cw_max) |
| 620 | __field(u8, aifs) | 636 | __field(u8, aifs) |
| 621 | __field(int, ret) | ||
| 622 | ), | 637 | ), |
| 623 | 638 | ||
| 624 | TP_fast_assign( | 639 | TP_fast_assign( |
| 625 | LOCAL_ASSIGN; | 640 | LOCAL_ASSIGN; |
| 626 | __entry->queue = queue; | 641 | __entry->queue = queue; |
| 627 | __entry->ret = ret; | ||
| 628 | __entry->txop = params->txop; | 642 | __entry->txop = params->txop; |
| 629 | __entry->cw_max = params->cw_max; | 643 | __entry->cw_max = params->cw_max; |
| 630 | __entry->cw_min = params->cw_min; | 644 | __entry->cw_min = params->cw_min; |
| @@ -632,29 +646,27 @@ TRACE_EVENT(drv_conf_tx, | |||
| 632 | ), | 646 | ), |
| 633 | 647 | ||
| 634 | TP_printk( | 648 | TP_printk( |
| 635 | LOCAL_PR_FMT " queue:%d ret:%d", | 649 | LOCAL_PR_FMT " queue:%d", |
| 636 | LOCAL_PR_ARG, __entry->queue, __entry->ret | 650 | LOCAL_PR_ARG, __entry->queue |
| 637 | ) | 651 | ) |
| 638 | ); | 652 | ); |
| 639 | 653 | ||
| 640 | TRACE_EVENT(drv_get_tsf, | 654 | TRACE_EVENT(drv_get_tsf, |
| 641 | TP_PROTO(struct ieee80211_local *local, u64 ret), | 655 | TP_PROTO(struct ieee80211_local *local), |
| 642 | 656 | ||
| 643 | TP_ARGS(local, ret), | 657 | TP_ARGS(local), |
| 644 | 658 | ||
| 645 | TP_STRUCT__entry( | 659 | TP_STRUCT__entry( |
| 646 | LOCAL_ENTRY | 660 | LOCAL_ENTRY |
| 647 | __field(u64, ret) | ||
| 648 | ), | 661 | ), |
| 649 | 662 | ||
| 650 | TP_fast_assign( | 663 | TP_fast_assign( |
| 651 | LOCAL_ASSIGN; | 664 | LOCAL_ASSIGN; |
| 652 | __entry->ret = ret; | ||
| 653 | ), | 665 | ), |
| 654 | 666 | ||
| 655 | TP_printk( | 667 | TP_printk( |
| 656 | LOCAL_PR_FMT " ret:%llu", | 668 | LOCAL_PR_FMT, |
| 657 | LOCAL_PR_ARG, (unsigned long long)__entry->ret | 669 | LOCAL_PR_ARG |
| 658 | ) | 670 | ) |
| 659 | ); | 671 | ); |
| 660 | 672 | ||
| @@ -698,23 +710,21 @@ TRACE_EVENT(drv_reset_tsf, | |||
| 698 | ); | 710 | ); |
| 699 | 711 | ||
| 700 | TRACE_EVENT(drv_tx_last_beacon, | 712 | TRACE_EVENT(drv_tx_last_beacon, |
| 701 | TP_PROTO(struct ieee80211_local *local, int ret), | 713 | TP_PROTO(struct ieee80211_local *local), |
| 702 | 714 | ||
| 703 | TP_ARGS(local, ret), | 715 | TP_ARGS(local), |
| 704 | 716 | ||
| 705 | TP_STRUCT__entry( | 717 | TP_STRUCT__entry( |
| 706 | LOCAL_ENTRY | 718 | LOCAL_ENTRY |
| 707 | __field(int, ret) | ||
| 708 | ), | 719 | ), |
| 709 | 720 | ||
| 710 | TP_fast_assign( | 721 | TP_fast_assign( |
| 711 | LOCAL_ASSIGN; | 722 | LOCAL_ASSIGN; |
| 712 | __entry->ret = ret; | ||
| 713 | ), | 723 | ), |
| 714 | 724 | ||
| 715 | TP_printk( | 725 | TP_printk( |
| 716 | LOCAL_PR_FMT " ret:%d", | 726 | LOCAL_PR_FMT, |
| 717 | LOCAL_PR_ARG, __entry->ret | 727 | LOCAL_PR_ARG |
| 718 | ) | 728 | ) |
| 719 | ); | 729 | ); |
| 720 | 730 | ||
| @@ -723,9 +733,9 @@ TRACE_EVENT(drv_ampdu_action, | |||
| 723 | struct ieee80211_sub_if_data *sdata, | 733 | struct ieee80211_sub_if_data *sdata, |
| 724 | enum ieee80211_ampdu_mlme_action action, | 734 | enum ieee80211_ampdu_mlme_action action, |
| 725 | struct ieee80211_sta *sta, u16 tid, | 735 | struct ieee80211_sta *sta, u16 tid, |
| 726 | u16 *ssn, int ret), | 736 | u16 *ssn), |
| 727 | 737 | ||
| 728 | TP_ARGS(local, sdata, action, sta, tid, ssn, ret), | 738 | TP_ARGS(local, sdata, action, sta, tid, ssn), |
| 729 | 739 | ||
| 730 | TP_STRUCT__entry( | 740 | TP_STRUCT__entry( |
| 731 | LOCAL_ENTRY | 741 | LOCAL_ENTRY |
| @@ -733,7 +743,6 @@ TRACE_EVENT(drv_ampdu_action, | |||
| 733 | __field(u32, action) | 743 | __field(u32, action) |
| 734 | __field(u16, tid) | 744 | __field(u16, tid) |
| 735 | __field(u16, ssn) | 745 | __field(u16, ssn) |
| 736 | __field(int, ret) | ||
| 737 | VIF_ENTRY | 746 | VIF_ENTRY |
| 738 | ), | 747 | ), |
| 739 | 748 | ||
| @@ -741,15 +750,36 @@ TRACE_EVENT(drv_ampdu_action, | |||
| 741 | LOCAL_ASSIGN; | 750 | LOCAL_ASSIGN; |
| 742 | VIF_ASSIGN; | 751 | VIF_ASSIGN; |
| 743 | STA_ASSIGN; | 752 | STA_ASSIGN; |
| 744 | __entry->ret = ret; | ||
| 745 | __entry->action = action; | 753 | __entry->action = action; |
| 746 | __entry->tid = tid; | 754 | __entry->tid = tid; |
| 747 | __entry->ssn = ssn ? *ssn : 0; | 755 | __entry->ssn = ssn ? *ssn : 0; |
| 748 | ), | 756 | ), |
| 749 | 757 | ||
| 750 | TP_printk( | 758 | TP_printk( |
| 751 | LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " action:%d tid:%d ret:%d", | 759 | LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " action:%d tid:%d", |
| 752 | LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->action, __entry->tid, __entry->ret | 760 | LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->action, __entry->tid |
| 761 | ) | ||
| 762 | ); | ||
| 763 | |||
| 764 | TRACE_EVENT(drv_get_survey, | ||
| 765 | TP_PROTO(struct ieee80211_local *local, int idx, | ||
| 766 | struct survey_info *survey), | ||
| 767 | |||
| 768 | TP_ARGS(local, idx, survey), | ||
| 769 | |||
| 770 | TP_STRUCT__entry( | ||
| 771 | LOCAL_ENTRY | ||
| 772 | __field(int, idx) | ||
| 773 | ), | ||
| 774 | |||
| 775 | TP_fast_assign( | ||
| 776 | LOCAL_ASSIGN; | ||
| 777 | __entry->idx = idx; | ||
| 778 | ), | ||
| 779 | |||
| 780 | TP_printk( | ||
| 781 | LOCAL_PR_FMT " idx:%d", | ||
| 782 | LOCAL_PR_ARG, __entry->idx | ||
| 753 | ) | 783 | ) |
| 754 | ); | 784 | ); |
| 755 | 785 | ||
| @@ -851,25 +881,23 @@ TRACE_EVENT(api_start_tx_ba_cb, | |||
| 851 | ); | 881 | ); |
| 852 | 882 | ||
| 853 | TRACE_EVENT(api_stop_tx_ba_session, | 883 | TRACE_EVENT(api_stop_tx_ba_session, |
| 854 | TP_PROTO(struct ieee80211_sta *sta, u16 tid, u16 initiator), | 884 | TP_PROTO(struct ieee80211_sta *sta, u16 tid), |
| 855 | 885 | ||
| 856 | TP_ARGS(sta, tid, initiator), | 886 | TP_ARGS(sta, tid), |
| 857 | 887 | ||
| 858 | TP_STRUCT__entry( | 888 | TP_STRUCT__entry( |
| 859 | STA_ENTRY | 889 | STA_ENTRY |
| 860 | __field(u16, tid) | 890 | __field(u16, tid) |
| 861 | __field(u16, initiator) | ||
| 862 | ), | 891 | ), |
| 863 | 892 | ||
| 864 | TP_fast_assign( | 893 | TP_fast_assign( |
| 865 | STA_ASSIGN; | 894 | STA_ASSIGN; |
| 866 | __entry->tid = tid; | 895 | __entry->tid = tid; |
| 867 | __entry->initiator = initiator; | ||
| 868 | ), | 896 | ), |
| 869 | 897 | ||
| 870 | TP_printk( | 898 | TP_printk( |
| 871 | STA_PR_FMT " tid:%d initiator:%d", | 899 | STA_PR_FMT " tid:%d", |
| 872 | STA_PR_ARG, __entry->tid, __entry->initiator | 900 | STA_PR_ARG, __entry->tid |
| 873 | ) | 901 | ) |
| 874 | ); | 902 | ); |
| 875 | 903 | ||
