From 736101135ae90faf524dc8d94b4d4bbde94446da Mon Sep 17 00:00:00 2001 From: Kirill Andreev Date: Fri, 31 Jul 2009 18:32:29 +0400 Subject: [PATCH] Removed unneded changes from wifi --- src/devices/wifi/mac-low.cc | 1 - src/devices/wifi/qos-utils.cc | 11 +++++++++-- src/devices/wifi/yans-wifi-phy.cc | 1 - 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/devices/wifi/mac-low.cc b/src/devices/wifi/mac-low.cc index 9ab5809dc..bc0ee2035 100644 --- a/src/devices/wifi/mac-low.cc +++ b/src/devices/wifi/mac-low.cc @@ -271,7 +271,6 @@ void MacLow::DoDispose (void) { NS_LOG_FUNCTION (this); - m_listener = 0; CancelAllEvents (); m_phy = 0; m_stationManager = 0; diff --git a/src/devices/wifi/qos-utils.cc b/src/devices/wifi/qos-utils.cc index ff6c3a102..8effbe1ab 100644 --- a/src/devices/wifi/qos-utils.cc +++ b/src/devices/wifi/qos-utils.cc @@ -28,23 +28,30 @@ QosUtilsMapTidToAc (uint8_t tid) 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 --git a/src/devices/wifi/yans-wifi-phy.cc b/src/devices/wifi/yans-wifi-phy.cc index f807d655c..75024b1c2 100644 --- a/src/devices/wifi/yans-wifi-phy.cc +++ b/src/devices/wifi/yans-wifi-phy.cc @@ -346,7 +346,6 @@ YansWifiPhy::SetReceiveOkCallback (SyncOkCallback callback) { m_state->SetReceiveOkCallback (callback); } - void YansWifiPhy::SetReceiveErrorCallback (SyncErrorCallback callback) {