diff options
Diffstat (limited to 'net/core/pktgen.c')
-rw-r--r-- | net/core/pktgen.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 0304f981f7ff..fc17a9d309ac 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c | |||
@@ -573,7 +573,7 @@ static int pktgen_if_show(struct seq_file *seq, void *v) | |||
573 | is_zero_ether_addr(pkt_dev->src_mac) ? | 573 | is_zero_ether_addr(pkt_dev->src_mac) ? |
574 | pkt_dev->odev->dev_addr : pkt_dev->src_mac); | 574 | pkt_dev->odev->dev_addr : pkt_dev->src_mac); |
575 | 575 | ||
576 | seq_printf(seq, "dst_mac: "); | 576 | seq_puts(seq, "dst_mac: "); |
577 | seq_printf(seq, "%pM\n", pkt_dev->dst_mac); | 577 | seq_printf(seq, "%pM\n", pkt_dev->dst_mac); |
578 | 578 | ||
579 | seq_printf(seq, | 579 | seq_printf(seq, |
@@ -588,7 +588,7 @@ static int pktgen_if_show(struct seq_file *seq, void *v) | |||
588 | 588 | ||
589 | if (pkt_dev->nr_labels) { | 589 | if (pkt_dev->nr_labels) { |
590 | unsigned int i; | 590 | unsigned int i; |
591 | seq_printf(seq, " mpls: "); | 591 | seq_puts(seq, " mpls: "); |
592 | for (i = 0; i < pkt_dev->nr_labels; i++) | 592 | for (i = 0; i < pkt_dev->nr_labels; i++) |
593 | seq_printf(seq, "%08x%s", ntohl(pkt_dev->labels[i]), | 593 | seq_printf(seq, "%08x%s", ntohl(pkt_dev->labels[i]), |
594 | i == pkt_dev->nr_labels-1 ? "\n" : ", "); | 594 | i == pkt_dev->nr_labels-1 ? "\n" : ", "); |
@@ -613,67 +613,67 @@ static int pktgen_if_show(struct seq_file *seq, void *v) | |||
613 | if (pkt_dev->node >= 0) | 613 | if (pkt_dev->node >= 0) |
614 | seq_printf(seq, " node: %d\n", pkt_dev->node); | 614 | seq_printf(seq, " node: %d\n", pkt_dev->node); |
615 | 615 | ||
616 | seq_printf(seq, " Flags: "); | 616 | seq_puts(seq, " Flags: "); |
617 | 617 | ||
618 | if (pkt_dev->flags & F_IPV6) | 618 | if (pkt_dev->flags & F_IPV6) |
619 | seq_printf(seq, "IPV6 "); | 619 | seq_puts(seq, "IPV6 "); |
620 | 620 | ||
621 | if (pkt_dev->flags & F_IPSRC_RND) | 621 | if (pkt_dev->flags & F_IPSRC_RND) |
622 | seq_printf(seq, "IPSRC_RND "); | 622 | seq_puts(seq, "IPSRC_RND "); |
623 | 623 | ||
624 | if (pkt_dev->flags & F_IPDST_RND) | 624 | if (pkt_dev->flags & F_IPDST_RND) |
625 | seq_printf(seq, "IPDST_RND "); | 625 | seq_puts(seq, "IPDST_RND "); |
626 | 626 | ||
627 | if (pkt_dev->flags & F_TXSIZE_RND) | 627 | if (pkt_dev->flags & F_TXSIZE_RND) |
628 | seq_printf(seq, "TXSIZE_RND "); | 628 | seq_puts(seq, "TXSIZE_RND "); |
629 | 629 | ||
630 | if (pkt_dev->flags & F_UDPSRC_RND) | 630 | if (pkt_dev->flags & F_UDPSRC_RND) |
631 | seq_printf(seq, "UDPSRC_RND "); | 631 | seq_puts(seq, "UDPSRC_RND "); |
632 | 632 | ||
633 | if (pkt_dev->flags & F_UDPDST_RND) | 633 | if (pkt_dev->flags & F_UDPDST_RND) |
634 | seq_printf(seq, "UDPDST_RND "); | 634 | seq_puts(seq, "UDPDST_RND "); |
635 | 635 | ||
636 | if (pkt_dev->flags & F_UDPCSUM) | 636 | if (pkt_dev->flags & F_UDPCSUM) |
637 | seq_printf(seq, "UDPCSUM "); | 637 | seq_puts(seq, "UDPCSUM "); |
638 | 638 | ||
639 | if (pkt_dev->flags & F_MPLS_RND) | 639 | if (pkt_dev->flags & F_MPLS_RND) |
640 | seq_printf(seq, "MPLS_RND "); | 640 | seq_puts(seq, "MPLS_RND "); |
641 | 641 | ||
642 | if (pkt_dev->flags & F_QUEUE_MAP_RND) | 642 | if (pkt_dev->flags & F_QUEUE_MAP_RND) |
643 | seq_printf(seq, "QUEUE_MAP_RND "); | 643 | seq_puts(seq, "QUEUE_MAP_RND "); |
644 | 644 | ||
645 | if (pkt_dev->flags & F_QUEUE_MAP_CPU) | 645 | if (pkt_dev->flags & F_QUEUE_MAP_CPU) |
646 | seq_printf(seq, "QUEUE_MAP_CPU "); | 646 | seq_puts(seq, "QUEUE_MAP_CPU "); |
647 | 647 | ||
648 | if (pkt_dev->cflows) { | 648 | if (pkt_dev->cflows) { |
649 | if (pkt_dev->flags & F_FLOW_SEQ) | 649 | if (pkt_dev->flags & F_FLOW_SEQ) |
650 | seq_printf(seq, "FLOW_SEQ "); /*in sequence flows*/ | 650 | seq_puts(seq, "FLOW_SEQ "); /*in sequence flows*/ |
651 | else | 651 | else |
652 | seq_printf(seq, "FLOW_RND "); | 652 | seq_puts(seq, "FLOW_RND "); |
653 | } | 653 | } |
654 | 654 | ||
655 | #ifdef CONFIG_XFRM | 655 | #ifdef CONFIG_XFRM |
656 | if (pkt_dev->flags & F_IPSEC_ON) { | 656 | if (pkt_dev->flags & F_IPSEC_ON) { |
657 | seq_printf(seq, "IPSEC "); | 657 | seq_puts(seq, "IPSEC "); |
658 | if (pkt_dev->spi) | 658 | if (pkt_dev->spi) |
659 | seq_printf(seq, "spi:%u", pkt_dev->spi); | 659 | seq_printf(seq, "spi:%u", pkt_dev->spi); |
660 | } | 660 | } |
661 | #endif | 661 | #endif |
662 | 662 | ||
663 | if (pkt_dev->flags & F_MACSRC_RND) | 663 | if (pkt_dev->flags & F_MACSRC_RND) |
664 | seq_printf(seq, "MACSRC_RND "); | 664 | seq_puts(seq, "MACSRC_RND "); |
665 | 665 | ||
666 | if (pkt_dev->flags & F_MACDST_RND) | 666 | if (pkt_dev->flags & F_MACDST_RND) |
667 | seq_printf(seq, "MACDST_RND "); | 667 | seq_puts(seq, "MACDST_RND "); |
668 | 668 | ||
669 | if (pkt_dev->flags & F_VID_RND) | 669 | if (pkt_dev->flags & F_VID_RND) |
670 | seq_printf(seq, "VID_RND "); | 670 | seq_puts(seq, "VID_RND "); |
671 | 671 | ||
672 | if (pkt_dev->flags & F_SVID_RND) | 672 | if (pkt_dev->flags & F_SVID_RND) |
673 | seq_printf(seq, "SVID_RND "); | 673 | seq_puts(seq, "SVID_RND "); |
674 | 674 | ||
675 | if (pkt_dev->flags & F_NODE) | 675 | if (pkt_dev->flags & F_NODE) |
676 | seq_printf(seq, "NODE_ALLOC "); | 676 | seq_puts(seq, "NODE_ALLOC "); |
677 | 677 | ||
678 | seq_puts(seq, "\n"); | 678 | seq_puts(seq, "\n"); |
679 | 679 | ||
@@ -716,7 +716,7 @@ static int pktgen_if_show(struct seq_file *seq, void *v) | |||
716 | if (pkt_dev->result[0]) | 716 | if (pkt_dev->result[0]) |
717 | seq_printf(seq, "Result: %s\n", pkt_dev->result); | 717 | seq_printf(seq, "Result: %s\n", pkt_dev->result); |
718 | else | 718 | else |
719 | seq_printf(seq, "Result: Idle\n"); | 719 | seq_puts(seq, "Result: Idle\n"); |
720 | 720 | ||
721 | return 0; | 721 | return 0; |
722 | } | 722 | } |
@@ -1735,14 +1735,14 @@ static int pktgen_thread_show(struct seq_file *seq, void *v) | |||
1735 | 1735 | ||
1736 | BUG_ON(!t); | 1736 | BUG_ON(!t); |
1737 | 1737 | ||
1738 | seq_printf(seq, "Running: "); | 1738 | seq_puts(seq, "Running: "); |
1739 | 1739 | ||
1740 | if_lock(t); | 1740 | if_lock(t); |
1741 | list_for_each_entry(pkt_dev, &t->if_list, list) | 1741 | list_for_each_entry(pkt_dev, &t->if_list, list) |
1742 | if (pkt_dev->running) | 1742 | if (pkt_dev->running) |
1743 | seq_printf(seq, "%s ", pkt_dev->odevname); | 1743 | seq_printf(seq, "%s ", pkt_dev->odevname); |
1744 | 1744 | ||
1745 | seq_printf(seq, "\nStopped: "); | 1745 | seq_puts(seq, "\nStopped: "); |
1746 | 1746 | ||
1747 | list_for_each_entry(pkt_dev, &t->if_list, list) | 1747 | list_for_each_entry(pkt_dev, &t->if_list, list) |
1748 | if (!pkt_dev->running) | 1748 | if (!pkt_dev->running) |
@@ -1751,7 +1751,7 @@ static int pktgen_thread_show(struct seq_file *seq, void *v) | |||
1751 | if (t->result[0]) | 1751 | if (t->result[0]) |
1752 | seq_printf(seq, "\nResult: %s\n", t->result); | 1752 | seq_printf(seq, "\nResult: %s\n", t->result); |
1753 | else | 1753 | else |
1754 | seq_printf(seq, "\nResult: NA\n"); | 1754 | seq_puts(seq, "\nResult: NA\n"); |
1755 | 1755 | ||
1756 | if_unlock(t); | 1756 | if_unlock(t); |
1757 | 1757 | ||