From ba54ebd95c4721b28062db6cf466b893f04f4240 Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Thu, 16 Mar 2017 23:28:16 +0100
Subject: [PATCH] internet: (fixes #2671) fix misspell in
 ArpCache::Entry::SetMacAddress

---
 RELEASE_NOTES                   | 3 ++-
 src/internet/model/arp-cache.cc | 6 ++++++
 src/internet/model/arp-cache.h  | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 71ae26546..ff1bc3f70 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -99,7 +99,8 @@ Bugs fixed
 - Bug 2655 - A-MPDU simulation using TCP sometimes fails with message "Packet has no Traffic ID"
 - Bug 2660 - TrafficControlHelper::Default should not configure internal queue sizes
 - Bug 2665 - Ipv4RawSocket can not send packets to broadcast or multicast
- 
+- Bug 2671 - ArpCache::Entry::SetMacAddress is misspelled
+
 Known issues
 ------------
 In general, known issues are tracked on the project tracker available
diff --git a/src/internet/model/arp-cache.cc b/src/internet/model/arp-cache.cc
index 27753ef1b..623c22389 100644
--- a/src/internet/model/arp-cache.cc
+++ b/src/internet/model/arp-cache.cc
@@ -462,6 +462,12 @@ ArpCache::Entry::SetMacAddresss (Address macAddress)
   NS_LOG_FUNCTION (this);
   m_macAddress = macAddress;
 }
+void 
+ArpCache::Entry::SetMacAddress (Address macAddress)
+{
+  NS_LOG_FUNCTION (this);
+  m_macAddress = macAddress;
+}
 Ipv4Address 
 ArpCache::Entry::GetIpv4Address (void) const
 {
diff --git a/src/internet/model/arp-cache.h b/src/internet/model/arp-cache.h
index 56ef98a8f..f3a607d06 100644
--- a/src/internet/model/arp-cache.h
+++ b/src/internet/model/arp-cache.h
@@ -242,8 +242,14 @@ public:
     Ipv4Address GetIpv4Address (void) const;
     /**
      * \param macAddress The MacAddress for this entry
+     * \deprecated This (misspelled) method will go away in future versions of ns-3, in favor of the correctly spelled version.
      */
+    NS_DEPRECATED
     void SetMacAddresss (Address macAddress);
+    /**
+     * \param macAddress The MacAddress for this entry
+     */
+    void SetMacAddress (Address macAddress);
     /**
      * \param destination The Ipv4Address for this entry
      */