pinsched: Update next_txq pointer when destroying pinqueue.

When a packet-in queue is destroyed, update next_txq if it is referencing
the destroyed queue. NULL is a valid value for next_txq.

Signed-off-by: Tony van der Peet <tony.vanderpeet@alliedtelesis.co.nz>
Signed-off-by: Ben Pfaff <blp@ovn.org>

diff --git a/ofproto/pinsched.c b/ofproto/pinsched.c
index 51f176050384dd1f6fd5bd4e7e1af8ad4833a42f..500115ad2bbfdb7c00cb9ced719f31df20d6b481 100644 (file)
--- a/ofproto/pinsched.c
+++ b/ofproto/pinsched.c
@@ -94,6 +94,12 @@ adjust_limits(int *rate_limit, int *burst_limit)
 static void
 pinqueue_destroy(struct pinsched *ps, struct pinqueue *q)
 {
+    if (ps->next_txq == q) {
+        advance_txq(ps);
+        if (ps->next_txq == q) {
+            ps->next_txq = NULL;
+        }
+    }
     hmap_remove(&ps->queues, &q->node);
     free(q);
 }