examples: remove extra new line after link duplex

[dpdk.git] / examples / qos_sched / init.c

diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c
index 32e6e1b..9626c15 100644 (file)
--- a/examples/qos_sched/init.c
+++ b/examples/qos_sched/init.c
@@ -164,7 +164,7 @@ app_init_port(uint16_t portid, struct rte_mempool *mp)
                printf(" Link Up - speed %u Mbps - %s\n",
                        (uint32_t) link.link_speed,
                        (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-                       ("full-duplex") : ("half-duplex\n"));
+                       ("full-duplex") : ("half-duplex"));
        } else {
                printf(" Link Down\n");
        }
@@ -180,18 +180,6 @@ app_init_port(uint16_t portid, struct rte_mempool *mp)
        return 0;
 }
 
-static struct rte_sched_subport_params subport_params[MAX_SCHED_SUBPORTS] = {
-       {
-               .tb_rate = 1250000000,
-               .tb_size = 1000000,
-
-               .tc_rate = {1250000000, 1250000000, 1250000000, 1250000000,
-                       1250000000, 1250000000, 1250000000, 1250000000, 1250000000,
-                       1250000000, 1250000000, 1250000000, 1250000000},
-               .tc_period = 10,
-       },
-};
-
 static struct rte_sched_pipe_params pipe_profiles[MAX_SCHED_PIPE_PROFILES] = {
        { /* Profile #0 */
                .tb_rate = 305175,
@@ -208,19 +196,21 @@ static struct rte_sched_pipe_params pipe_profiles[MAX_SCHED_PIPE_PROFILES] = {
        },
 };
 
-struct rte_sched_port_params port_params = {
-       .name = "port_scheduler_0",
-       .socket = 0, /* computed */
-       .rate = 0, /* computed */
-       .mtu = 6 + 6 + 4 + 4 + 2 + 1500,
-       .frame_overhead = RTE_SCHED_FRAME_OVERHEAD_DEFAULT,
-       .n_subports_per_port = 1,
-       .n_pipes_per_subport = 4096,
-       .qsize = {64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64},
-       .pipe_profiles = pipe_profiles,
-       .n_pipe_profiles = sizeof(pipe_profiles) / sizeof(struct rte_sched_pipe_params),
-       .n_max_pipe_profiles = MAX_SCHED_PIPE_PROFILES,
+struct rte_sched_subport_params subport_params[MAX_SCHED_SUBPORTS] = {
+       {
+               .tb_rate = 1250000000,
+               .tb_size = 1000000,
 
+               .tc_rate = {1250000000, 1250000000, 1250000000, 1250000000,
+                       1250000000, 1250000000, 1250000000, 1250000000, 1250000000,
+                       1250000000, 1250000000, 1250000000, 1250000000},
+               .tc_period = 10,
+               .n_pipes_per_subport_enabled = 4096,
+               .qsize = {64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64},
+               .pipe_profiles = pipe_profiles,
+               .n_pipe_profiles = sizeof(pipe_profiles) /
+                       sizeof(struct rte_sched_pipe_params),
+               .n_max_pipe_profiles = MAX_SCHED_PIPE_PROFILES,
 #ifdef RTE_SCHED_RED
        .red_params = {
                /* Traffic Class 0 Colors Green / Yellow / Red */
@@ -289,6 +279,17 @@ struct rte_sched_port_params port_params = {
                [12][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2 = 9},
        },
 #endif /* RTE_SCHED_RED */
+       },
+};
+
+struct rte_sched_port_params port_params = {
+       .name = "port_scheduler_0",
+       .socket = 0, /* computed */
+       .rate = 0, /* computed */
+       .mtu = 6 + 6 + 4 + 4 + 2 + 1500,
+       .frame_overhead = RTE_SCHED_FRAME_OVERHEAD_DEFAULT,
+       .n_subports_per_port = 1,
+       .n_pipes_per_subport = MAX_SCHED_PIPES,
 };
 
 static struct rte_sched_port *
@@ -323,7 +324,10 @@ app_init_sched_port(uint32_t portid, uint32_t socketid)
                                        subport, err);
                }
 
-               for (pipe = 0; pipe < port_params.n_pipes_per_subport; pipe++) {
+               uint32_t n_pipes_per_subport =
+                       subport_params[subport].n_pipes_per_subport_enabled;
+
+               for (pipe = 0; pipe < n_pipes_per_subport; pipe++) {
                        if (app_pipe_to_profile[subport][pipe] != -1) {
                                err = rte_sched_pipe_config(port, subport, pipe,
                                                app_pipe_to_profile[subport][pipe]);