# HG changeset patch
# User Tom Henderson <tomh@tomh.org>
# Date 1296064429 28800
# Node ID 17f9a64dd4f65efc80a92acc5ec9e8c852a3d9cb
# Parent  afe95f44de9352e170d9509c31ce3675aeeb0bb2
bugfix:  CsmaNetDevice ErrorModel not discarding packet (reported by Rafal Mielniczuk)

diff -r afe95f44de93 -r 17f9a64dd4f6 RELEASE_NOTES
--- a/RELEASE_NOTES	Wed Jan 26 10:56:33 2011 -0800
+++ b/RELEASE_NOTES	Wed Jan 26 09:53:49 2011 -0800
@@ -28,6 +28,7 @@
 since ns-3.10, in many cases referencing the Bugzilla bug number.
 
    - Fixed the UanPhyGen::IsStateBusy method, error with logical OR
+   - CsmaNetDevice ReceiveErrorModel was not dropping the packet
 
 Known issues
 ------------
diff -r afe95f44de93 -r 17f9a64dd4f6 src/devices/csma/csma-net-device.cc
--- a/src/devices/csma/csma-net-device.cc	Wed Jan 26 10:56:33 2011 -0800
+++ b/src/devices/csma/csma-net-device.cc	Wed Jan 26 09:53:49 2011 -0800
@@ -681,6 +681,7 @@
     {
       NS_LOG_LOGIC ("Dropping pkt due to error model ");
       m_phyRxDropTrace (packet);
+      return;
     }
 
   //