From 124add66d95fb68526a9aa94b4310d00e1dec242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Sat, 11 Nov 2017 19:55:24 +0100 Subject: [PATCH] wifi: Remove duplicated function WifiNetDevice::DoGetChannel --- src/wifi/model/wifi-net-device.cc | 8 +------- src/wifi/model/wifi-net-device.h | 6 ------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/wifi/model/wifi-net-device.cc b/src/wifi/model/wifi-net-device.cc index 456010664..ea6456374 100644 --- a/src/wifi/model/wifi-net-device.cc +++ b/src/wifi/model/wifi-net-device.cc @@ -48,7 +48,7 @@ WifiNetDevice::GetTypeId (void) MakeUintegerChecker (1,MAX_MSDU_SIZE - LLC_SNAP_HEADER_LENGTH)) .AddAttribute ("Channel", "The channel attached to this device", PointerValue (), - MakePointerAccessor (&WifiNetDevice::DoGetChannel), + MakePointerAccessor (&WifiNetDevice::GetChannel), MakePointerChecker ()) .AddAttribute ("Phy", "The PHY layer attached to this device.", PointerValue (), @@ -254,12 +254,6 @@ WifiNetDevice::GetChannel (void) const return m_phy->GetChannel (); } -Ptr -WifiNetDevice::DoGetChannel (void) const -{ - return m_phy->GetChannel (); -} - void WifiNetDevice::SetAddress (Address address) { diff --git a/src/wifi/model/wifi-net-device.h b/src/wifi/model/wifi-net-device.h index adfd4f6fe..7ac8d5384 100644 --- a/src/wifi/model/wifi-net-device.h +++ b/src/wifi/model/wifi-net-device.h @@ -156,12 +156,6 @@ private: * Set that the link is down (i.e. STA is not associated). */ void LinkDown (void); - /** - * Return the Channel this device is connected to. - * - * \return Ptr to Channel object - */ - Ptr DoGetChannel (void) const; /** * Complete the configuration of this Wi-Fi device by * connecting all lower components (e.g. MAC, WifiRemoteStation) together.