diff options
author | Karicheri, Muralidharan <m-karicheri2@ti.com> | 2015-03-20 16:11:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-20 22:03:09 -0400 |
commit | da866ba055bf934c21bd936bbec01d69deffef95 (patch) | |
tree | 407654a64eb764867044ce13d29b735844baf349 /drivers/net/ethernet/ti/netcp_ethss.c | |
parent | f49ae1492962ed3618ef57db7ce07c671e314632 (diff) |
net: netcp: enclose macros in parentheses
Fix following checkpatch error. It seems to have passed checkpatch
last time when original code was introduced.
ERROR: Macros with complex values should be enclosed in parentheses
#172: FILE: drivers/net/ethernet/ti/netcp_ethss.c:869:
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: WingMan Kwok <w-kwok2@ti.com>
CC: "David S. Miller" <davem@davemloft.net>
CC: Mugunthan V N <mugunthanvnm@ti.com>
CC: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
CC: Grygorii Strashko <grygorii.strashko@ti.com>
CC: Christoph Jaeger <cj@linux.com>
CC: Lokesh Vutla <lokeshvutla@ti.com>
CC: Markus Pargmann <mpa@pengutronix.de>
CC: Kumar Gala <galak@codeaurora.org>
CC: Ian Campbell <ijc+devicetree@hellion.org.uk>
CC: Mark Rutland <mark.rutland@arm.com>
CC: Pawel Moll <pawel.moll@arm.com>
CC: Rob Herring <robh+dt@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti/netcp_ethss.c')
-rw-r--r-- | drivers/net/ethernet/ti/netcp_ethss.c | 523 |
1 files changed, 272 insertions, 251 deletions
diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c index 42592b8fc344..f8f3be3fd59f 100644 --- a/drivers/net/ethernet/ti/netcp_ethss.c +++ b/drivers/net/ethernet/ti/netcp_ethss.c | |||
@@ -482,275 +482,296 @@ struct netcp_ethtool_stat { | |||
482 | int offset; | 482 | int offset; |
483 | }; | 483 | }; |
484 | 484 | ||
485 | #define GBE_STATSA_INFO(field) "GBE_A:"#field, GBE_STATSA_MODULE,\ | 485 | #define GBE_STATSA_INFO(field) \ |
486 | FIELD_SIZEOF(struct gbe_hw_stats, field), \ | 486 | { \ |
487 | offsetof(struct gbe_hw_stats, field) | 487 | "GBE_A:"#field, GBE_STATSA_MODULE, \ |
488 | FIELD_SIZEOF(struct gbe_hw_stats, field), \ | ||
489 | offsetof(struct gbe_hw_stats, field) \ | ||
490 | } | ||
488 | 491 | ||
489 | #define GBE_STATSB_INFO(field) "GBE_B:"#field, GBE_STATSB_MODULE,\ | 492 | #define GBE_STATSB_INFO(field) \ |
490 | FIELD_SIZEOF(struct gbe_hw_stats, field), \ | 493 | { \ |
491 | offsetof(struct gbe_hw_stats, field) | 494 | "GBE_B:"#field, GBE_STATSB_MODULE, \ |
495 | FIELD_SIZEOF(struct gbe_hw_stats, field), \ | ||
496 | offsetof(struct gbe_hw_stats, field) \ | ||
497 | } | ||
492 | 498 | ||
493 | #define GBE_STATSC_INFO(field) "GBE_C:"#field, GBE_STATSC_MODULE,\ | 499 | #define GBE_STATSC_INFO(field) \ |
494 | FIELD_SIZEOF(struct gbe_hw_stats, field), \ | 500 | { \ |
495 | offsetof(struct gbe_hw_stats, field) | 501 | "GBE_C:"#field, GBE_STATSC_MODULE, \ |
502 | FIELD_SIZEOF(struct gbe_hw_stats, field), \ | ||
503 | offsetof(struct gbe_hw_stats, field) \ | ||
504 | } | ||
496 | 505 | ||
497 | #define GBE_STATSD_INFO(field) "GBE_D:"#field, GBE_STATSD_MODULE,\ | 506 | #define GBE_STATSD_INFO(field) \ |
498 | FIELD_SIZEOF(struct gbe_hw_stats, field), \ | 507 | { \ |
499 | offsetof(struct gbe_hw_stats, field) | 508 | "GBE_D:"#field, GBE_STATSD_MODULE, \ |
509 | FIELD_SIZEOF(struct gbe_hw_stats, field), \ | ||
510 | offsetof(struct gbe_hw_stats, field) \ | ||
511 | } | ||
500 | 512 | ||
501 | static const struct netcp_ethtool_stat gbe13_et_stats[] = { | 513 | static const struct netcp_ethtool_stat gbe13_et_stats[] = { |
502 | /* GBE module A */ | 514 | /* GBE module A */ |
503 | {GBE_STATSA_INFO(rx_good_frames)}, | 515 | GBE_STATSA_INFO(rx_good_frames), |
504 | {GBE_STATSA_INFO(rx_broadcast_frames)}, | 516 | GBE_STATSA_INFO(rx_broadcast_frames), |
505 | {GBE_STATSA_INFO(rx_multicast_frames)}, | 517 | GBE_STATSA_INFO(rx_multicast_frames), |
506 | {GBE_STATSA_INFO(rx_pause_frames)}, | 518 | GBE_STATSA_INFO(rx_pause_frames), |
507 | {GBE_STATSA_INFO(rx_crc_errors)}, | 519 | GBE_STATSA_INFO(rx_crc_errors), |
508 | {GBE_STATSA_INFO(rx_align_code_errors)}, | 520 | GBE_STATSA_INFO(rx_align_code_errors), |
509 | {GBE_STATSA_INFO(rx_oversized_frames)}, | 521 | GBE_STATSA_INFO(rx_oversized_frames), |
510 | {GBE_STATSA_INFO(rx_jabber_frames)}, | 522 | GBE_STATSA_INFO(rx_jabber_frames), |
511 | {GBE_STATSA_INFO(rx_undersized_frames)}, | 523 | GBE_STATSA_INFO(rx_undersized_frames), |
512 | {GBE_STATSA_INFO(rx_fragments)}, | 524 | GBE_STATSA_INFO(rx_fragments), |
513 | {GBE_STATSA_INFO(rx_bytes)}, | 525 | GBE_STATSA_INFO(rx_bytes), |
514 | {GBE_STATSA_INFO(tx_good_frames)}, | 526 | GBE_STATSA_INFO(tx_good_frames), |
515 | {GBE_STATSA_INFO(tx_broadcast_frames)}, | 527 | GBE_STATSA_INFO(tx_broadcast_frames), |
516 | {GBE_STATSA_INFO(tx_multicast_frames)}, | 528 | GBE_STATSA_INFO(tx_multicast_frames), |
517 | {GBE_STATSA_INFO(tx_pause_frames)}, | 529 | GBE_STATSA_INFO(tx_pause_frames), |
518 | {GBE_STATSA_INFO(tx_deferred_frames)}, | 530 | GBE_STATSA_INFO(tx_deferred_frames), |
519 | {GBE_STATSA_INFO(tx_collision_frames)}, | 531 | GBE_STATSA_INFO(tx_collision_frames), |
520 | {GBE_STATSA_INFO(tx_single_coll_frames)}, | 532 | GBE_STATSA_INFO(tx_single_coll_frames), |
521 | {GBE_STATSA_INFO(tx_mult_coll_frames)}, | 533 | GBE_STATSA_INFO(tx_mult_coll_frames), |
522 | {GBE_STATSA_INFO(tx_excessive_collisions)}, | 534 | GBE_STATSA_INFO(tx_excessive_collisions), |
523 | {GBE_STATSA_INFO(tx_late_collisions)}, | 535 | GBE_STATSA_INFO(tx_late_collisions), |
524 | {GBE_STATSA_INFO(tx_underrun)}, | 536 | GBE_STATSA_INFO(tx_underrun), |
525 | {GBE_STATSA_INFO(tx_carrier_sense_errors)}, | 537 | GBE_STATSA_INFO(tx_carrier_sense_errors), |
526 | {GBE_STATSA_INFO(tx_bytes)}, | 538 | GBE_STATSA_INFO(tx_bytes), |
527 | {GBE_STATSA_INFO(tx_64byte_frames)}, | 539 | GBE_STATSA_INFO(tx_64byte_frames), |
528 | {GBE_STATSA_INFO(tx_65_to_127byte_frames)}, | 540 | GBE_STATSA_INFO(tx_65_to_127byte_frames), |
529 | {GBE_STATSA_INFO(tx_128_to_255byte_frames)}, | 541 | GBE_STATSA_INFO(tx_128_to_255byte_frames), |
530 | {GBE_STATSA_INFO(tx_256_to_511byte_frames)}, | 542 | GBE_STATSA_INFO(tx_256_to_511byte_frames), |
531 | {GBE_STATSA_INFO(tx_512_to_1023byte_frames)}, | 543 | GBE_STATSA_INFO(tx_512_to_1023byte_frames), |
532 | {GBE_STATSA_INFO(tx_1024byte_frames)}, | 544 | GBE_STATSA_INFO(tx_1024byte_frames), |
533 | {GBE_STATSA_INFO(net_bytes)}, | 545 | GBE_STATSA_INFO(net_bytes), |
534 | {GBE_STATSA_INFO(rx_sof_overruns)}, | 546 | GBE_STATSA_INFO(rx_sof_overruns), |
535 | {GBE_STATSA_INFO(rx_mof_overruns)}, | 547 | GBE_STATSA_INFO(rx_mof_overruns), |
536 | {GBE_STATSA_INFO(rx_dma_overruns)}, | 548 | GBE_STATSA_INFO(rx_dma_overruns), |
537 | /* GBE module B */ | 549 | /* GBE module B */ |
538 | {GBE_STATSB_INFO(rx_good_frames)}, | 550 | GBE_STATSB_INFO(rx_good_frames), |
539 | {GBE_STATSB_INFO(rx_broadcast_frames)}, | 551 | GBE_STATSB_INFO(rx_broadcast_frames), |
540 | {GBE_STATSB_INFO(rx_multicast_frames)}, | 552 | GBE_STATSB_INFO(rx_multicast_frames), |
541 | {GBE_STATSB_INFO(rx_pause_frames)}, | 553 | GBE_STATSB_INFO(rx_pause_frames), |
542 | {GBE_STATSB_INFO(rx_crc_errors)}, | 554 | GBE_STATSB_INFO(rx_crc_errors), |
543 | {GBE_STATSB_INFO(rx_align_code_errors)}, | 555 | GBE_STATSB_INFO(rx_align_code_errors), |
544 | {GBE_STATSB_INFO(rx_oversized_frames)}, | 556 | GBE_STATSB_INFO(rx_oversized_frames), |
545 | {GBE_STATSB_INFO(rx_jabber_frames)}, | 557 | GBE_STATSB_INFO(rx_jabber_frames), |
546 | {GBE_STATSB_INFO(rx_undersized_frames)}, | 558 | GBE_STATSB_INFO(rx_undersized_frames), |
547 | {GBE_STATSB_INFO(rx_fragments)}, | 559 | GBE_STATSB_INFO(rx_fragments), |
548 | {GBE_STATSB_INFO(rx_bytes)}, | 560 | GBE_STATSB_INFO(rx_bytes), |
549 | {GBE_STATSB_INFO(tx_good_frames)}, | 561 | GBE_STATSB_INFO(tx_good_frames), |
550 | {GBE_STATSB_INFO(tx_broadcast_frames)}, | 562 | GBE_STATSB_INFO(tx_broadcast_frames), |
551 | {GBE_STATSB_INFO(tx_multicast_frames)}, | 563 | GBE_STATSB_INFO(tx_multicast_frames), |
552 | {GBE_STATSB_INFO(tx_pause_frames)}, | 564 | GBE_STATSB_INFO(tx_pause_frames), |
553 | {GBE_STATSB_INFO(tx_deferred_frames)}, | 565 | GBE_STATSB_INFO(tx_deferred_frames), |
554 | {GBE_STATSB_INFO(tx_collision_frames)}, | 566 | GBE_STATSB_INFO(tx_collision_frames), |
555 | {GBE_STATSB_INFO(tx_single_coll_frames)}, | 567 | GBE_STATSB_INFO(tx_single_coll_frames), |
556 | {GBE_STATSB_INFO(tx_mult_coll_frames)}, | 568 | GBE_STATSB_INFO(tx_mult_coll_frames), |
557 | {GBE_STATSB_INFO(tx_excessive_collisions)}, | 569 | GBE_STATSB_INFO(tx_excessive_collisions), |
558 | {GBE_STATSB_INFO(tx_late_collisions)}, | 570 | GBE_STATSB_INFO(tx_late_collisions), |
559 | {GBE_STATSB_INFO(tx_underrun)}, | 571 | GBE_STATSB_INFO(tx_underrun), |
560 | {GBE_STATSB_INFO(tx_carrier_sense_errors)}, | 572 | GBE_STATSB_INFO(tx_carrier_sense_errors), |
561 | {GBE_STATSB_INFO(tx_bytes)}, | 573 | GBE_STATSB_INFO(tx_bytes), |
562 | {GBE_STATSB_INFO(tx_64byte_frames)}, | 574 | GBE_STATSB_INFO(tx_64byte_frames), |
563 | {GBE_STATSB_INFO(tx_65_to_127byte_frames)}, | 575 | GBE_STATSB_INFO(tx_65_to_127byte_frames), |
564 | {GBE_STATSB_INFO(tx_128_to_255byte_frames)}, | 576 | GBE_STATSB_INFO(tx_128_to_255byte_frames), |
565 | {GBE_STATSB_INFO(tx_256_to_511byte_frames)}, | 577 | GBE_STATSB_INFO(tx_256_to_511byte_frames), |
566 | {GBE_STATSB_INFO(tx_512_to_1023byte_frames)}, | 578 | GBE_STATSB_INFO(tx_512_to_1023byte_frames), |
567 | {GBE_STATSB_INFO(tx_1024byte_frames)}, | 579 | GBE_STATSB_INFO(tx_1024byte_frames), |
568 | {GBE_STATSB_INFO(net_bytes)}, | 580 | GBE_STATSB_INFO(net_bytes), |
569 | {GBE_STATSB_INFO(rx_sof_overruns)}, | 581 | GBE_STATSB_INFO(rx_sof_overruns), |
570 | {GBE_STATSB_INFO(rx_mof_overruns)}, | 582 | GBE_STATSB_INFO(rx_mof_overruns), |
571 | {GBE_STATSB_INFO(rx_dma_overruns)}, | 583 | GBE_STATSB_INFO(rx_dma_overruns), |
572 | /* GBE module C */ | 584 | /* GBE module C */ |
573 | {GBE_STATSC_INFO(rx_good_frames)}, | 585 | GBE_STATSC_INFO(rx_good_frames), |
574 | {GBE_STATSC_INFO(rx_broadcast_frames)}, | 586 | GBE_STATSC_INFO(rx_broadcast_frames), |
575 | {GBE_STATSC_INFO(rx_multicast_frames)}, | 587 | GBE_STATSC_INFO(rx_multicast_frames), |
576 | {GBE_STATSC_INFO(rx_pause_frames)}, | 588 | GBE_STATSC_INFO(rx_pause_frames), |
577 | {GBE_STATSC_INFO(rx_crc_errors)}, | 589 | GBE_STATSC_INFO(rx_crc_errors), |
578 | {GBE_STATSC_INFO(rx_align_code_errors)}, | 590 | GBE_STATSC_INFO(rx_align_code_errors), |
579 | {GBE_STATSC_INFO(rx_oversized_frames)}, | 591 | GBE_STATSC_INFO(rx_oversized_frames), |
580 | {GBE_STATSC_INFO(rx_jabber_frames)}, | 592 | GBE_STATSC_INFO(rx_jabber_frames), |
581 | {GBE_STATSC_INFO(rx_undersized_frames)}, | 593 | GBE_STATSC_INFO(rx_undersized_frames), |
582 | {GBE_STATSC_INFO(rx_fragments)}, | 594 | GBE_STATSC_INFO(rx_fragments), |
583 | {GBE_STATSC_INFO(rx_bytes)}, | 595 | GBE_STATSC_INFO(rx_bytes), |
584 | {GBE_STATSC_INFO(tx_good_frames)}, | 596 | GBE_STATSC_INFO(tx_good_frames), |
585 | {GBE_STATSC_INFO(tx_broadcast_frames)}, | 597 | GBE_STATSC_INFO(tx_broadcast_frames), |
586 | {GBE_STATSC_INFO(tx_multicast_frames)}, | 598 | GBE_STATSC_INFO(tx_multicast_frames), |
587 | {GBE_STATSC_INFO(tx_pause_frames)}, | 599 | GBE_STATSC_INFO(tx_pause_frames), |
588 | {GBE_STATSC_INFO(tx_deferred_frames)}, | 600 | GBE_STATSC_INFO(tx_deferred_frames), |
589 | {GBE_STATSC_INFO(tx_collision_frames)}, | 601 | GBE_STATSC_INFO(tx_collision_frames), |
590 | {GBE_STATSC_INFO(tx_single_coll_frames)}, | 602 | GBE_STATSC_INFO(tx_single_coll_frames), |
591 | {GBE_STATSC_INFO(tx_mult_coll_frames)}, | 603 | GBE_STATSC_INFO(tx_mult_coll_frames), |
592 | {GBE_STATSC_INFO(tx_excessive_collisions)}, | 604 | GBE_STATSC_INFO(tx_excessive_collisions), |
593 | {GBE_STATSC_INFO(tx_late_collisions)}, | 605 | GBE_STATSC_INFO(tx_late_collisions), |
594 | {GBE_STATSC_INFO(tx_underrun)}, | 606 | GBE_STATSC_INFO(tx_underrun), |
595 | {GBE_STATSC_INFO(tx_carrier_sense_errors)}, | 607 | GBE_STATSC_INFO(tx_carrier_sense_errors), |
596 | {GBE_STATSC_INFO(tx_bytes)}, | 608 | GBE_STATSC_INFO(tx_bytes), |
597 | {GBE_STATSC_INFO(tx_64byte_frames)}, | 609 | GBE_STATSC_INFO(tx_64byte_frames), |
598 | {GBE_STATSC_INFO(tx_65_to_127byte_frames)}, | 610 | GBE_STATSC_INFO(tx_65_to_127byte_frames), |
599 | {GBE_STATSC_INFO(tx_128_to_255byte_frames)}, | 611 | GBE_STATSC_INFO(tx_128_to_255byte_frames), |
600 | {GBE_STATSC_INFO(tx_256_to_511byte_frames)}, | 612 | GBE_STATSC_INFO(tx_256_to_511byte_frames), |
601 | {GBE_STATSC_INFO(tx_512_to_1023byte_frames)}, | 613 | GBE_STATSC_INFO(tx_512_to_1023byte_frames), |
602 | {GBE_STATSC_INFO(tx_1024byte_frames)}, | 614 | GBE_STATSC_INFO(tx_1024byte_frames), |
603 | {GBE_STATSC_INFO(net_bytes)}, | 615 | GBE_STATSC_INFO(net_bytes), |
604 | {GBE_STATSC_INFO(rx_sof_overruns)}, | 616 | GBE_STATSC_INFO(rx_sof_overruns), |
605 | {GBE_STATSC_INFO(rx_mof_overruns)}, | 617 | GBE_STATSC_INFO(rx_mof_overruns), |
606 | {GBE_STATSC_INFO(rx_dma_overruns)}, | 618 | GBE_STATSC_INFO(rx_dma_overruns), |
607 | /* GBE module D */ | 619 | /* GBE module D */ |
608 | {GBE_STATSD_INFO(rx_good_frames)}, | 620 | GBE_STATSD_INFO(rx_good_frames), |
609 | {GBE_STATSD_INFO(rx_broadcast_frames)}, | 621 | GBE_STATSD_INFO(rx_broadcast_frames), |
610 | {GBE_STATSD_INFO(rx_multicast_frames)}, | 622 | GBE_STATSD_INFO(rx_multicast_frames), |
611 | {GBE_STATSD_INFO(rx_pause_frames)}, | 623 | GBE_STATSD_INFO(rx_pause_frames), |
612 | {GBE_STATSD_INFO(rx_crc_errors)}, | 624 | GBE_STATSD_INFO(rx_crc_errors), |
613 | {GBE_STATSD_INFO(rx_align_code_errors)}, | 625 | GBE_STATSD_INFO(rx_align_code_errors), |
614 | {GBE_STATSD_INFO(rx_oversized_frames)}, | 626 | GBE_STATSD_INFO(rx_oversized_frames), |
615 | {GBE_STATSD_INFO(rx_jabber_frames)}, | 627 | GBE_STATSD_INFO(rx_jabber_frames), |
616 | {GBE_STATSD_INFO(rx_undersized_frames)}, | 628 | GBE_STATSD_INFO(rx_undersized_frames), |
617 | {GBE_STATSD_INFO(rx_fragments)}, | 629 | GBE_STATSD_INFO(rx_fragments), |
618 | {GBE_STATSD_INFO(rx_bytes)}, | 630 | GBE_STATSD_INFO(rx_bytes), |
619 | {GBE_STATSD_INFO(tx_good_frames)}, | 631 | GBE_STATSD_INFO(tx_good_frames), |
620 | {GBE_STATSD_INFO(tx_broadcast_frames)}, | 632 | GBE_STATSD_INFO(tx_broadcast_frames), |
621 | {GBE_STATSD_INFO(tx_multicast_frames)}, | 633 | GBE_STATSD_INFO(tx_multicast_frames), |
622 | {GBE_STATSD_INFO(tx_pause_frames)}, | 634 | GBE_STATSD_INFO(tx_pause_frames), |
623 | {GBE_STATSD_INFO(tx_deferred_frames)}, | 635 | GBE_STATSD_INFO(tx_deferred_frames), |
624 | {GBE_STATSD_INFO(tx_collision_frames)}, | 636 | GBE_STATSD_INFO(tx_collision_frames), |
625 | {GBE_STATSD_INFO(tx_single_coll_frames)}, | 637 | GBE_STATSD_INFO(tx_single_coll_frames), |
626 | {GBE_STATSD_INFO(tx_mult_coll_frames)}, | 638 | GBE_STATSD_INFO(tx_mult_coll_frames), |
627 | {GBE_STATSD_INFO(tx_excessive_collisions)}, | 639 | GBE_STATSD_INFO(tx_excessive_collisions), |
628 | {GBE_STATSD_INFO(tx_late_collisions)}, | 640 | GBE_STATSD_INFO(tx_late_collisions), |
629 | {GBE_STATSD_INFO(tx_underrun)}, | 641 | GBE_STATSD_INFO(tx_underrun), |
630 | {GBE_STATSD_INFO(tx_carrier_sense_errors)}, | 642 | GBE_STATSD_INFO(tx_carrier_sense_errors), |
631 | {GBE_STATSD_INFO(tx_bytes)}, | 643 | GBE_STATSD_INFO(tx_bytes), |
632 | {GBE_STATSD_INFO(tx_64byte_frames)}, | 644 | GBE_STATSD_INFO(tx_64byte_frames), |
633 | {GBE_STATSD_INFO(tx_65_to_127byte_frames)}, | 645 | GBE_STATSD_INFO(tx_65_to_127byte_frames), |
634 | {GBE_STATSD_INFO(tx_128_to_255byte_frames)}, | 646 | GBE_STATSD_INFO(tx_128_to_255byte_frames), |
635 | {GBE_STATSD_INFO(tx_256_to_511byte_frames)}, | 647 | GBE_STATSD_INFO(tx_256_to_511byte_frames), |
636 | {GBE_STATSD_INFO(tx_512_to_1023byte_frames)}, | 648 | GBE_STATSD_INFO(tx_512_to_1023byte_frames), |
637 | {GBE_STATSD_INFO(tx_1024byte_frames)}, | 649 | GBE_STATSD_INFO(tx_1024byte_frames), |
638 | {GBE_STATSD_INFO(net_bytes)}, | 650 | GBE_STATSD_INFO(net_bytes), |
639 | {GBE_STATSD_INFO(rx_sof_overruns)}, | 651 | GBE_STATSD_INFO(rx_sof_overruns), |
640 | {GBE_STATSD_INFO(rx_mof_overruns)}, | 652 | GBE_STATSD_INFO(rx_mof_overruns), |
641 | {GBE_STATSD_INFO(rx_dma_overruns)}, | 653 | GBE_STATSD_INFO(rx_dma_overruns), |
642 | }; | 654 | }; |
643 | 655 | ||
644 | #define XGBE_STATS0_INFO(field) "GBE_0:"#field, XGBE_STATS0_MODULE, \ | 656 | #define XGBE_STATS0_INFO(field) \ |
645 | FIELD_SIZEOF(struct xgbe_hw_stats, field), \ | 657 | { \ |
646 | offsetof(struct xgbe_hw_stats, field) | 658 | "GBE_0:"#field, XGBE_STATS0_MODULE, \ |
659 | FIELD_SIZEOF(struct xgbe_hw_stats, field), \ | ||
660 | offsetof(struct xgbe_hw_stats, field) \ | ||
661 | } | ||
647 | 662 | ||
648 | #define XGBE_STATS1_INFO(field) "GBE_1:"#field, XGBE_STATS1_MODULE, \ | 663 | #define XGBE_STATS1_INFO(field) \ |
649 | FIELD_SIZEOF(struct xgbe_hw_stats, field), \ | 664 | { \ |
650 | offsetof(struct xgbe_hw_stats, field) | 665 | "GBE_1:"#field, XGBE_STATS1_MODULE, \ |
666 | FIELD_SIZEOF(struct xgbe_hw_stats, field), \ | ||
667 | offsetof(struct xgbe_hw_stats, field) \ | ||
668 | } | ||
651 | 669 | ||
652 | #define XGBE_STATS2_INFO(field) "GBE_2:"#field, XGBE_STATS2_MODULE, \ | 670 | #define XGBE_STATS2_INFO(field) \ |
653 | FIELD_SIZEOF(struct xgbe_hw_stats, field), \ | 671 | { \ |
654 | offsetof(struct xgbe_hw_stats, field) | 672 | "GBE_2:"#field, XGBE_STATS2_MODULE, \ |
673 | FIELD_SIZEOF(struct xgbe_hw_stats, field), \ | ||
674 | offsetof(struct xgbe_hw_stats, field) \ | ||
675 | } | ||
655 | 676 | ||
656 | static const struct netcp_ethtool_stat xgbe10_et_stats[] = { | 677 | static const struct netcp_ethtool_stat xgbe10_et_stats[] = { |
657 | /* GBE module 0 */ | 678 | /* GBE module 0 */ |
658 | {XGBE_STATS0_INFO(rx_good_frames)}, | 679 | XGBE_STATS0_INFO(rx_good_frames), |
659 | {XGBE_STATS0_INFO(rx_broadcast_frames)}, | 680 | XGBE_STATS0_INFO(rx_broadcast_frames), |
660 | {XGBE_STATS0_INFO(rx_multicast_frames)}, | 681 | XGBE_STATS0_INFO(rx_multicast_frames), |
661 | {XGBE_STATS0_INFO(rx_oversized_frames)}, | 682 | XGBE_STATS0_INFO(rx_oversized_frames), |
662 | {XGBE_STATS0_INFO(rx_undersized_frames)}, | 683 | XGBE_STATS0_INFO(rx_undersized_frames), |
663 | {XGBE_STATS0_INFO(overrun_type4)}, | 684 | XGBE_STATS0_INFO(overrun_type4), |
664 | {XGBE_STATS0_INFO(overrun_type5)}, | 685 | XGBE_STATS0_INFO(overrun_type5), |
665 | {XGBE_STATS0_INFO(rx_bytes)}, | 686 | XGBE_STATS0_INFO(rx_bytes), |
666 | {XGBE_STATS0_INFO(tx_good_frames)}, | 687 | XGBE_STATS0_INFO(tx_good_frames), |
667 | {XGBE_STATS0_INFO(tx_broadcast_frames)}, | 688 | XGBE_STATS0_INFO(tx_broadcast_frames), |
668 | {XGBE_STATS0_INFO(tx_multicast_frames)}, | 689 | XGBE_STATS0_INFO(tx_multicast_frames), |
669 | {XGBE_STATS0_INFO(tx_bytes)}, | 690 | XGBE_STATS0_INFO(tx_bytes), |
670 | {XGBE_STATS0_INFO(tx_64byte_frames)}, | 691 | XGBE_STATS0_INFO(tx_64byte_frames), |
671 | {XGBE_STATS0_INFO(tx_65_to_127byte_frames)}, | 692 | XGBE_STATS0_INFO(tx_65_to_127byte_frames), |
672 | {XGBE_STATS0_INFO(tx_128_to_255byte_frames)}, | 693 | XGBE_STATS0_INFO(tx_128_to_255byte_frames), |
673 | {XGBE_STATS0_INFO(tx_256_to_511byte_frames)}, | 694 | XGBE_STATS0_INFO(tx_256_to_511byte_frames), |
674 | {XGBE_STATS0_INFO(tx_512_to_1023byte_frames)}, | 695 | XGBE_STATS0_INFO(tx_512_to_1023byte_frames), |
675 | {XGBE_STATS0_INFO(tx_1024byte_frames)}, | 696 | XGBE_STATS0_INFO(tx_1024byte_frames), |
676 | {XGBE_STATS0_INFO(net_bytes)}, | 697 | XGBE_STATS0_INFO(net_bytes), |
677 | {XGBE_STATS0_INFO(rx_sof_overruns)}, | 698 | XGBE_STATS0_INFO(rx_sof_overruns), |
678 | {XGBE_STATS0_INFO(rx_mof_overruns)}, | 699 | XGBE_STATS0_INFO(rx_mof_overruns), |
679 | {XGBE_STATS0_INFO(rx_dma_overruns)}, | 700 | XGBE_STATS0_INFO(rx_dma_overruns), |
680 | /* XGBE module 1 */ | 701 | /* XGBE module 1 */ |
681 | {XGBE_STATS1_INFO(rx_good_frames)}, | 702 | XGBE_STATS1_INFO(rx_good_frames), |
682 | {XGBE_STATS1_INFO(rx_broadcast_frames)}, | 703 | XGBE_STATS1_INFO(rx_broadcast_frames), |
683 | {XGBE_STATS1_INFO(rx_multicast_frames)}, | 704 | XGBE_STATS1_INFO(rx_multicast_frames), |
684 | {XGBE_STATS1_INFO(rx_pause_frames)}, | 705 | XGBE_STATS1_INFO(rx_pause_frames), |
685 | {XGBE_STATS1_INFO(rx_crc_errors)}, | 706 | XGBE_STATS1_INFO(rx_crc_errors), |
686 | {XGBE_STATS1_INFO(rx_align_code_errors)}, | 707 | XGBE_STATS1_INFO(rx_align_code_errors), |
687 | {XGBE_STATS1_INFO(rx_oversized_frames)}, | 708 | XGBE_STATS1_INFO(rx_oversized_frames), |
688 | {XGBE_STATS1_INFO(rx_jabber_frames)}, | 709 | XGBE_STATS1_INFO(rx_jabber_frames), |
689 | {XGBE_STATS1_INFO(rx_undersized_frames)}, | 710 | XGBE_STATS1_INFO(rx_undersized_frames), |
690 | {XGBE_STATS1_INFO(rx_fragments)}, | 711 | XGBE_STATS1_INFO(rx_fragments), |
691 | {XGBE_STATS1_INFO(overrun_type4)}, | 712 | XGBE_STATS1_INFO(overrun_type4), |
692 | {XGBE_STATS1_INFO(overrun_type5)}, | 713 | XGBE_STATS1_INFO(overrun_type5), |
693 | {XGBE_STATS1_INFO(rx_bytes)}, | 714 | XGBE_STATS1_INFO(rx_bytes), |
694 | {XGBE_STATS1_INFO(tx_good_frames)}, | 715 | XGBE_STATS1_INFO(tx_good_frames), |
695 | {XGBE_STATS1_INFO(tx_broadcast_frames)}, | 716 | XGBE_STATS1_INFO(tx_broadcast_frames), |
696 | {XGBE_STATS1_INFO(tx_multicast_frames)}, | 717 | XGBE_STATS1_INFO(tx_multicast_frames), |
697 | {XGBE_STATS1_INFO(tx_pause_frames)}, | 718 | XGBE_STATS1_INFO(tx_pause_frames), |
698 | {XGBE_STATS1_INFO(tx_deferred_frames)}, | 719 | XGBE_STATS1_INFO(tx_deferred_frames), |
699 | {XGBE_STATS1_INFO(tx_collision_frames)}, | 720 | XGBE_STATS1_INFO(tx_collision_frames), |
700 | {XGBE_STATS1_INFO(tx_single_coll_frames)}, | 721 | XGBE_STATS1_INFO(tx_single_coll_frames), |
701 | {XGBE_STATS1_INFO(tx_mult_coll_frames)}, | 722 | XGBE_STATS1_INFO(tx_mult_coll_frames), |
702 | {XGBE_STATS1_INFO(tx_excessive_collisions)}, | 723 | XGBE_STATS1_INFO(tx_excessive_collisions), |
703 | {XGBE_STATS1_INFO(tx_late_collisions)}, | 724 | XGBE_STATS1_INFO(tx_late_collisions), |
704 | {XGBE_STATS1_INFO(tx_underrun)}, | 725 | XGBE_STATS1_INFO(tx_underrun), |
705 | {XGBE_STATS1_INFO(tx_carrier_sense_errors)}, | 726 | XGBE_STATS1_INFO(tx_carrier_sense_errors), |
706 | {XGBE_STATS1_INFO(tx_bytes)}, | 727 | XGBE_STATS1_INFO(tx_bytes), |
707 | {XGBE_STATS1_INFO(tx_64byte_frames)}, | 728 | XGBE_STATS1_INFO(tx_64byte_frames), |
708 | {XGBE_STATS1_INFO(tx_65_to_127byte_frames)}, | 729 | XGBE_STATS1_INFO(tx_65_to_127byte_frames), |
709 | {XGBE_STATS1_INFO(tx_128_to_255byte_frames)}, | 730 | XGBE_STATS1_INFO(tx_128_to_255byte_frames), |
710 | {XGBE_STATS1_INFO(tx_256_to_511byte_frames)}, | 731 | XGBE_STATS1_INFO(tx_256_to_511byte_frames), |
711 | {XGBE_STATS1_INFO(tx_512_to_1023byte_frames)}, | 732 | XGBE_STATS1_INFO(tx_512_to_1023byte_frames), |
712 | {XGBE_STATS1_INFO(tx_1024byte_frames)}, | 733 | XGBE_STATS1_INFO(tx_1024byte_frames), |
713 | {XGBE_STATS1_INFO(net_bytes)}, | 734 | XGBE_STATS1_INFO(net_bytes), |
714 | {XGBE_STATS1_INFO(rx_sof_overruns)}, | 735 | XGBE_STATS1_INFO(rx_sof_overruns), |
715 | {XGBE_STATS1_INFO(rx_mof_overruns)}, | 736 | XGBE_STATS1_INFO(rx_mof_overruns), |
716 | {XGBE_STATS1_INFO(rx_dma_overruns)}, | 737 | XGBE_STATS1_INFO(rx_dma_overruns), |
717 | /* XGBE module 2 */ | 738 | /* XGBE module 2 */ |
718 | {XGBE_STATS2_INFO(rx_good_frames)}, | 739 | XGBE_STATS2_INFO(rx_good_frames), |
719 | {XGBE_STATS2_INFO(rx_broadcast_frames)}, | 740 | XGBE_STATS2_INFO(rx_broadcast_frames), |
720 | {XGBE_STATS2_INFO(rx_multicast_frames)}, | 741 | XGBE_STATS2_INFO(rx_multicast_frames), |
721 | {XGBE_STATS2_INFO(rx_pause_frames)}, | 742 | XGBE_STATS2_INFO(rx_pause_frames), |
722 | {XGBE_STATS2_INFO(rx_crc_errors)}, | 743 | XGBE_STATS2_INFO(rx_crc_errors), |
723 | {XGBE_STATS2_INFO(rx_align_code_errors)}, | 744 | XGBE_STATS2_INFO(rx_align_code_errors), |
724 | {XGBE_STATS2_INFO(rx_oversized_frames)}, | 745 | XGBE_STATS2_INFO(rx_oversized_frames), |
725 | {XGBE_STATS2_INFO(rx_jabber_frames)}, | 746 | XGBE_STATS2_INFO(rx_jabber_frames), |
726 | {XGBE_STATS2_INFO(rx_undersized_frames)}, | 747 | XGBE_STATS2_INFO(rx_undersized_frames), |
727 | {XGBE_STATS2_INFO(rx_fragments)}, | 748 | XGBE_STATS2_INFO(rx_fragments), |
728 | {XGBE_STATS2_INFO(overrun_type4)}, | 749 | XGBE_STATS2_INFO(overrun_type4), |
729 | {XGBE_STATS2_INFO(overrun_type5)}, | 750 | XGBE_STATS2_INFO(overrun_type5), |
730 | {XGBE_STATS2_INFO(rx_bytes)}, | 751 | XGBE_STATS2_INFO(rx_bytes), |
731 | {XGBE_STATS2_INFO(tx_good_frames)}, | 752 | XGBE_STATS2_INFO(tx_good_frames), |
732 | {XGBE_STATS2_INFO(tx_broadcast_frames)}, | 753 | XGBE_STATS2_INFO(tx_broadcast_frames), |
733 | {XGBE_STATS2_INFO(tx_multicast_frames)}, | 754 | XGBE_STATS2_INFO(tx_multicast_frames), |
734 | {XGBE_STATS2_INFO(tx_pause_frames)}, | 755 | XGBE_STATS2_INFO(tx_pause_frames), |
735 | {XGBE_STATS2_INFO(tx_deferred_frames)}, | 756 | XGBE_STATS2_INFO(tx_deferred_frames), |
736 | {XGBE_STATS2_INFO(tx_collision_frames)}, | 757 | XGBE_STATS2_INFO(tx_collision_frames), |
737 | {XGBE_STATS2_INFO(tx_single_coll_frames)}, | 758 | XGBE_STATS2_INFO(tx_single_coll_frames), |
738 | {XGBE_STATS2_INFO(tx_mult_coll_frames)}, | 759 | XGBE_STATS2_INFO(tx_mult_coll_frames), |
739 | {XGBE_STATS2_INFO(tx_excessive_collisions)}, | 760 | XGBE_STATS2_INFO(tx_excessive_collisions), |
740 | {XGBE_STATS2_INFO(tx_late_collisions)}, | 761 | XGBE_STATS2_INFO(tx_late_collisions), |
741 | {XGBE_STATS2_INFO(tx_underrun)}, | 762 | XGBE_STATS2_INFO(tx_underrun), |
742 | {XGBE_STATS2_INFO(tx_carrier_sense_errors)}, | 763 | XGBE_STATS2_INFO(tx_carrier_sense_errors), |
743 | {XGBE_STATS2_INFO(tx_bytes)}, | 764 | XGBE_STATS2_INFO(tx_bytes), |
744 | {XGBE_STATS2_INFO(tx_64byte_frames)}, | 765 | XGBE_STATS2_INFO(tx_64byte_frames), |
745 | {XGBE_STATS2_INFO(tx_65_to_127byte_frames)}, | 766 | XGBE_STATS2_INFO(tx_65_to_127byte_frames), |
746 | {XGBE_STATS2_INFO(tx_128_to_255byte_frames)}, | 767 | XGBE_STATS2_INFO(tx_128_to_255byte_frames), |
747 | {XGBE_STATS2_INFO(tx_256_to_511byte_frames)}, | 768 | XGBE_STATS2_INFO(tx_256_to_511byte_frames), |
748 | {XGBE_STATS2_INFO(tx_512_to_1023byte_frames)}, | 769 | XGBE_STATS2_INFO(tx_512_to_1023byte_frames), |
749 | {XGBE_STATS2_INFO(tx_1024byte_frames)}, | 770 | XGBE_STATS2_INFO(tx_1024byte_frames), |
750 | {XGBE_STATS2_INFO(net_bytes)}, | 771 | XGBE_STATS2_INFO(net_bytes), |
751 | {XGBE_STATS2_INFO(rx_sof_overruns)}, | 772 | XGBE_STATS2_INFO(rx_sof_overruns), |
752 | {XGBE_STATS2_INFO(rx_mof_overruns)}, | 773 | XGBE_STATS2_INFO(rx_mof_overruns), |
753 | {XGBE_STATS2_INFO(rx_dma_overruns)}, | 774 | XGBE_STATS2_INFO(rx_dma_overruns), |
754 | }; | 775 | }; |
755 | 776 | ||
756 | #define for_each_intf(i, priv) \ | 777 | #define for_each_intf(i, priv) \ |