aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/pktgen.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2007-10-03 20:59:30 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:51:42 -0400
commit0795af5729b18218767fab27c44b1384f72dc9ad (patch)
tree67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /net/core/pktgen.c
parent95ea36275f3c9a1d3d04c217b4b576c657c4e70e (diff)
[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()
This is nicer than the MAC_FMT stuff. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/pktgen.c')
-rw-r--r--net/core/pktgen.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 94e42be16daa..f07bd590f8f9 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -599,11 +599,11 @@ static const struct file_operations pktgen_fops = {
599 599
600static int pktgen_if_show(struct seq_file *seq, void *v) 600static int pktgen_if_show(struct seq_file *seq, void *v)
601{ 601{
602 int i;
603 struct pktgen_dev *pkt_dev = seq->private; 602 struct pktgen_dev *pkt_dev = seq->private;
604 __u64 sa; 603 __u64 sa;
605 __u64 stopped; 604 __u64 stopped;
606 __u64 now = getCurUs(); 605 __u64 now = getCurUs();
606 DECLARE_MAC_BUF(mac);
607 607
608 seq_printf(seq, 608 seq_printf(seq,
609 "Params: count %llu min_pkt_size: %u max_pkt_size: %u\n", 609 "Params: count %llu min_pkt_size: %u max_pkt_size: %u\n",
@@ -648,19 +648,12 @@ static int pktgen_if_show(struct seq_file *seq, void *v)
648 648
649 seq_puts(seq, " src_mac: "); 649 seq_puts(seq, " src_mac: ");
650 650
651 if (is_zero_ether_addr(pkt_dev->src_mac)) 651 seq_printf(seq, "%s ",
652 for (i = 0; i < 6; i++) 652 print_mac(mac, is_zero_ether_addr(pkt_dev->src_mac) ?
653 seq_printf(seq, "%02X%s", pkt_dev->odev->dev_addr[i], 653 pkt_dev->odev->dev_addr : pkt_dev->src_mac));
654 i == 5 ? " " : ":");
655 else
656 for (i = 0; i < 6; i++)
657 seq_printf(seq, "%02X%s", pkt_dev->src_mac[i],
658 i == 5 ? " " : ":");
659 654
660 seq_printf(seq, "dst_mac: "); 655 seq_printf(seq, "dst_mac: ");
661 for (i = 0; i < 6; i++) 656 seq_printf(seq, "%s\n", print_mac(mac, pkt_dev->dst_mac));
662 seq_printf(seq, "%02X%s", pkt_dev->dst_mac[i],
663 i == 5 ? "\n" : ":");
664 657
665 seq_printf(seq, 658 seq_printf(seq,
666 " udp_src_min: %d udp_src_max: %d udp_dst_min: %d udp_dst_max: %d\n", 659 " udp_src_min: %d udp_src_max: %d udp_dst_min: %d udp_dst_max: %d\n",