From 7c33f161663fe76ca747626e0f25bd449ada9d75 Mon Sep 17 00:00:00 2001
From: "Gustavo J. A. M. Carneiro" <gjc@inescporto.pt>
Date: Sat, 30 May 2009 17:36:29 +0100
Subject: [PATCH] Remove TapNetDevice::[GS]etName; a couple of bug fixes.

---
 src/devices/tap-net-device/tap-net-device.cc | 15 +--------------
 src/devices/tap-net-device/tap-net-device.h  |  2 --
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/devices/tap-net-device/tap-net-device.cc b/src/devices/tap-net-device/tap-net-device.cc
index 871f9a799..86633fdad 100644
--- a/src/devices/tap-net-device/tap-net-device.cc
+++ b/src/devices/tap-net-device/tap-net-device.cc
@@ -120,18 +120,6 @@ TapNetDevice::PromiscReceive (Ptr<Packet> packet, uint16_t protocol,
 }
 
 
-void
-TapNetDevice::SetName (const std::string name)
-{
-  m_name = name;
-}
-
-std::string
-TapNetDevice::GetName (void) const
-{
-  return m_name;
-}
-
 void
 TapNetDevice::SetIfIndex (const uint32_t index)
 {
@@ -176,7 +164,7 @@ TapNetDevice::SetLinkChangeCallback (Callback<void> callback)
 bool
 TapNetDevice::IsBroadcast (void) const
 {
-  return m_needsArp;
+  return true;
 }
 
 Address
@@ -217,7 +205,6 @@ TapNetDevice::Send (Ptr<Packet> packet, const Address& dest, uint16_t protocolNu
 bool
 TapNetDevice::SendFrom (Ptr<Packet> packet, const Address& source, const Address& dest, uint16_t protocolNumber)
 {
-  NS_FATAL_ERROR ("not implemented");
   if (m_sendCb (packet, source, dest, protocolNumber))
     {
       m_txTrace (packet);
diff --git a/src/devices/tap-net-device/tap-net-device.h b/src/devices/tap-net-device/tap-net-device.h
index 38cffc0ac..df0963350 100644
--- a/src/devices/tap-net-device/tap-net-device.h
+++ b/src/devices/tap-net-device/tap-net-device.h
@@ -116,8 +116,6 @@ public:
 
 
   // inherited from NetDevice base class.
-  virtual void SetName(const std::string name);
-  virtual std::string GetName(void) const;
   virtual void SetIfIndex(const uint32_t index);
   virtual uint32_t GetIfIndex(void) const;
   virtual Ptr<Channel> GetChannel (void) const;