# HG changeset patch # User Kirill Andreev # Date 1249050749 -14400 # Node ID 8b505554235162852735427731a5727c355bbd6c # Parent 7b030cd9fc63b341d7b045a14acc6715968e7738 Removed unneded changes from wifi diff -r 7b030cd9fc63 -r 8b5055542351 src/devices/wifi/mac-low.cc --- a/src/devices/wifi/mac-low.cc Fri Jul 31 18:09:24 2009 +0400 +++ b/src/devices/wifi/mac-low.cc Fri Jul 31 18:32:29 2009 +0400 @@ -271,7 +271,6 @@ MacLow::DoDispose (void) { NS_LOG_FUNCTION (this); - m_listener = 0; CancelAllEvents (); m_phy = 0; m_stationManager = 0; diff -r 7b030cd9fc63 -r 8b5055542351 src/devices/wifi/qos-utils.cc --- a/src/devices/wifi/qos-utils.cc Fri Jul 31 18:09:24 2009 +0400 +++ b/src/devices/wifi/qos-utils.cc Fri Jul 31 18:32:29 2009 +0400 @@ -28,23 +28,30 @@ switch (tid) { case 0 : return AC_BE; + break; case 1 : return AC_BK; + break; case 2 : return AC_BK; + break; case 3 : return AC_BE; + break; case 4 : return AC_VI; + break; case 5 : return AC_VI; + break; case 6 : return AC_VO; + break; case 7 : return AC_VO; - default: - return AC_BE; + break; } + return AC_UNDEF; } uint8_t diff -r 7b030cd9fc63 -r 8b5055542351 src/devices/wifi/yans-wifi-phy.cc --- a/src/devices/wifi/yans-wifi-phy.cc Fri Jul 31 18:09:24 2009 +0400 +++ b/src/devices/wifi/yans-wifi-phy.cc Fri Jul 31 18:32:29 2009 +0400 @@ -346,7 +346,6 @@ { m_state->SetReceiveOkCallback (callback); } - void YansWifiPhy::SetReceiveErrorCallback (SyncErrorCallback callback) {