Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97dc48e2 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

pktgen: Use seq_puts() where seq_printf() is not needed 



Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a47e8f5a

net/core/pktgen.c

+25 −25
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ static int pktgen_if_show(struct seq_file *seq, void *v) 
		   is_zero_ether_addr(pkt_dev->src_mac) ?

			     pkt_dev->odev->dev_addr : pkt_dev->src_mac);



	seq_printf(seq, "dst_mac: ");

	seq_puts(seq, "dst_mac: ");

	seq_printf(seq, "%pM\n", pkt_dev->dst_mac);



	seq_printf(seq,
@@ -588,7 +588,7 @@ static int pktgen_if_show(struct seq_file *seq, void *v) 


	if (pkt_dev->nr_labels) {

		unsigned int i;

		seq_printf(seq, "     mpls: ");

		seq_puts(seq, "     mpls: ");

		for (i = 0; i < pkt_dev->nr_labels; i++)

			seq_printf(seq, "%08x%s", ntohl(pkt_dev->labels[i]),

				   i == pkt_dev->nr_labels-1 ? "\n" : ", ");
@@ -613,67 +613,67 @@ static int pktgen_if_show(struct seq_file *seq, void *v) 
	if (pkt_dev->node >= 0)

		seq_printf(seq, "     node: %d\n", pkt_dev->node);



	seq_printf(seq, "     Flags: ");

	seq_puts(seq, "     Flags: ");



	if (pkt_dev->flags & F_IPV6)

		seq_printf(seq, "IPV6  ");

		seq_puts(seq, "IPV6  ");



	if (pkt_dev->flags & F_IPSRC_RND)

		seq_printf(seq, "IPSRC_RND  ");

		seq_puts(seq, "IPSRC_RND  ");



	if (pkt_dev->flags & F_IPDST_RND)

		seq_printf(seq, "IPDST_RND  ");

		seq_puts(seq, "IPDST_RND  ");



	if (pkt_dev->flags & F_TXSIZE_RND)

		seq_printf(seq, "TXSIZE_RND  ");

		seq_puts(seq, "TXSIZE_RND  ");



	if (pkt_dev->flags & F_UDPSRC_RND)

		seq_printf(seq, "UDPSRC_RND  ");

		seq_puts(seq, "UDPSRC_RND  ");



	if (pkt_dev->flags & F_UDPDST_RND)

		seq_printf(seq, "UDPDST_RND  ");

		seq_puts(seq, "UDPDST_RND  ");



	if (pkt_dev->flags & F_UDPCSUM)

		seq_printf(seq, "UDPCSUM  ");

		seq_puts(seq, "UDPCSUM  ");



	if (pkt_dev->flags & F_MPLS_RND)

		seq_printf(seq,  "MPLS_RND  ");

		seq_puts(seq,  "MPLS_RND  ");



	if (pkt_dev->flags & F_QUEUE_MAP_RND)

		seq_printf(seq,  "QUEUE_MAP_RND  ");

		seq_puts(seq,  "QUEUE_MAP_RND  ");



	if (pkt_dev->flags & F_QUEUE_MAP_CPU)

		seq_printf(seq,  "QUEUE_MAP_CPU  ");

		seq_puts(seq,  "QUEUE_MAP_CPU  ");



	if (pkt_dev->cflows) {

		if (pkt_dev->flags & F_FLOW_SEQ)

			seq_printf(seq,  "FLOW_SEQ  "); /*in sequence flows*/

			seq_puts(seq,  "FLOW_SEQ  "); /*in sequence flows*/

		else

			seq_printf(seq,  "FLOW_RND  ");

			seq_puts(seq,  "FLOW_RND  ");

	}



#ifdef CONFIG_XFRM

	if (pkt_dev->flags & F_IPSEC_ON) {

		seq_printf(seq,  "IPSEC  ");

		seq_puts(seq,  "IPSEC  ");

		if (pkt_dev->spi)

			seq_printf(seq, "spi:%u", pkt_dev->spi);

	}

#endif



	if (pkt_dev->flags & F_MACSRC_RND)

		seq_printf(seq, "MACSRC_RND  ");

		seq_puts(seq, "MACSRC_RND  ");



	if (pkt_dev->flags & F_MACDST_RND)

		seq_printf(seq, "MACDST_RND  ");

		seq_puts(seq, "MACDST_RND  ");



	if (pkt_dev->flags & F_VID_RND)

		seq_printf(seq, "VID_RND  ");

		seq_puts(seq, "VID_RND  ");



	if (pkt_dev->flags & F_SVID_RND)

		seq_printf(seq, "SVID_RND  ");

		seq_puts(seq, "SVID_RND  ");



	if (pkt_dev->flags & F_NODE)

		seq_printf(seq, "NODE_ALLOC  ");

		seq_puts(seq, "NODE_ALLOC  ");



	seq_puts(seq, "\n");
@@ -716,7 +716,7 @@ static int pktgen_if_show(struct seq_file *seq, void *v) 
	if (pkt_dev->result[0])

		seq_printf(seq, "Result: %s\n", pkt_dev->result);

	else

		seq_printf(seq, "Result: Idle\n");

		seq_puts(seq, "Result: Idle\n");



	return 0;

}
@@ -1735,14 +1735,14 @@ static int pktgen_thread_show(struct seq_file *seq, void *v) 


	BUG_ON(!t);



	seq_printf(seq, "Running: ");

	seq_puts(seq, "Running: ");



	if_lock(t);

	list_for_each_entry(pkt_dev, &t->if_list, list)

		if (pkt_dev->running)

			seq_printf(seq, "%s ", pkt_dev->odevname);



	seq_printf(seq, "\nStopped: ");

	seq_puts(seq, "\nStopped: ");



	list_for_each_entry(pkt_dev, &t->if_list, list)

		if (!pkt_dev->running)
@@ -1751,7 +1751,7 @@ static int pktgen_thread_show(struct seq_file *seq, void *v) 
	if (t->result[0])

		seq_printf(seq, "\nResult: %s\n", t->result);

	else

		seq_printf(seq, "\nResult: NA\n");

		seq_puts(seq, "\nResult: NA\n");



	if_unlock(t);