--- a/src/devices/wifi/edca-txop-n.cc	Tue Sep 15 00:05:36 2009 -0700
+++ b/src/devices/wifi/edca-txop-n.cc	Tue Sep 15 10:47:02 2009 +0200
@@ -55,6 +55,9 @@
   virtual void DoNotifyCollision (void) {
     m_txop->NotifyCollision ();
   }
+  virtual void DoNotifyChannelSwitching (void) { 
+    m_txop->NotifyChannelSwitching ();
+  }
   EdcaTxopN *m_txop;
 };
 
@@ -427,6 +430,13 @@
   RestartAccessIfNeeded ();
 }
 
+void 
+EdcaTxopN::NotifyChannelSwitching (void)
+{
+  m_queue->Flush();
+  m_currentPacket = 0;
+}
+
 void
 EdcaTxopN::Queue (Ptr<const Packet> packet, WifiMacHeader const &hdr)
 {