bool queue_configured[IGC_MAX_TX_QUEUES] = { };
        u32 start_time = 0, end_time = 0;
        size_t n;
+       int i;
 
        adapter->qbv_enable = qopt->enable;
 
 
        for (n = 0; n < qopt->num_entries; n++) {
                struct tc_taprio_sched_entry *e = &qopt->entries[n];
-               int i;
 
                end_time += e->interval;
 
                start_time += e->interval;
        }
 
+       /* Check whether a queue gets configured.
+        * If not, set the start and end time to be end time.
+        */
+       for (i = 0; i < adapter->num_tx_queues; i++) {
+               if (!queue_configured[i]) {
+                       struct igc_ring *ring = adapter->tx_ring[i];
+
+                       ring->start_time = end_time;
+                       ring->end_time = end_time;
+               }
+       }
+
        return 0;
 }