diff --git a/src/node/queue.cc b/src/node/queue.cc
index 6aa0f4c45..082641b2d 100644
--- a/src/node/queue.cc
+++ b/src/node/queue.cc
@@ -100,8 +100,11 @@ Queue::Dequeue (void)
 void
 Queue::DequeueAll (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
-  NS_ASSERT_MSG (0, "Don't know what to do with dequeued packets!");
+  NS_LOG_FUNCTION (this);
+  while (!IsEmpty ())
+    {
+      Dequeue ();
+    }
 }
 
 Ptr<Packet>
diff --git a/src/node/queue.h b/src/node/queue.h
index dba69f5ad..b39e2ac71 100644
--- a/src/node/queue.h
+++ b/src/node/queue.h
@@ -69,7 +69,7 @@ public:
   Ptr<Packet> Peek (void) const;
 
   /**
-   * XXX Doesn't do anything right now, think its supposed to flush the queue
+   * Flush the queue.
    */
   void DequeueAll (void);
   /**