# HG changeset patch # User Mathieu Lacage # Date 1213294494 25200 # Node ID 804d92c1f7c3c0e151eefc1be79933d5431f025e # Parent 0d0517e7a557f63d77754806fc18e0e21843459a constify diff -r 0d0517e7a557 -r 804d92c1f7c3 src/devices/wifi/mac-low.cc --- a/src/devices/wifi/mac-low.cc Thu Jun 12 11:06:56 2008 -0700 +++ b/src/devices/wifi/mac-low.cc Thu Jun 12 11:14:54 2008 -0700 @@ -414,7 +414,7 @@ } void -MacLow::ReceiveError (Ptr packet, double rxSnr) +MacLow::ReceiveError (Ptr packet, double rxSnr) { NS_LOG_FUNCTION (this << packet << rxSnr); MY_DEBUG ("rx failed "); diff -r 0d0517e7a557 -r 804d92c1f7c3 src/devices/wifi/mac-low.h --- a/src/devices/wifi/mac-low.h Thu Jun 12 11:06:56 2008 -0700 +++ b/src/devices/wifi/mac-low.h Thu Jun 12 11:14:54 2008 -0700 @@ -339,7 +339,7 @@ * This method is typically invoked by the lower PHY layer to notify * the MAC layer that a packet was unsuccessfully received. */ - void ReceiveError (Ptr packet, double rxSnr); + void ReceiveError (Ptr packet, double rxSnr); private: void CancelAllEvents (void); uint32_t GetAckSize (void) const; diff -r 0d0517e7a557 -r 804d92c1f7c3 src/devices/wifi/wifi-phy-state-helper.cc --- a/src/devices/wifi/wifi-phy-state-helper.cc Thu Jun 12 11:06:56 2008 -0700 +++ b/src/devices/wifi/wifi-phy-state-helper.cc Thu Jun 12 11:14:54 2008 -0700 @@ -301,8 +301,7 @@ DoSwitchFromSync (); if (!m_syncErrorCallback.IsNull ()) { - // XXX - m_syncErrorCallback (packet->Copy (), snr); + m_syncErrorCallback (packet, snr); } } diff -r 0d0517e7a557 -r 804d92c1f7c3 src/devices/wifi/wifi-phy.h --- a/src/devices/wifi/wifi-phy.h Thu Jun 12 11:06:56 2008 -0700 +++ b/src/devices/wifi/wifi-phy.h Thu Jun 12 11:14:54 2008 -0700 @@ -121,7 +121,7 @@ * arg1: packet received unsuccessfully * arg2: snr of packet */ - typedef Callback, double> SyncErrorCallback; + typedef Callback, double> SyncErrorCallback; static TypeId GetTypeId (void);