From f47b9bce81c0b273b59fbef2616e6cfa81dd41a7 Mon Sep 17 00:00:00 2001
From: Tommaso Pecorella <tommaso.pecorella@unifi.it>
Date: Tue, 9 Jun 2015 23:41:06 +0200
Subject: [PATCH] Bug 2135 - TCP doesn't honor the socket's output interface

---
 RELEASE_NOTES                         | 1 +
 src/internet/model/tcp-l4-protocol.cc | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index ccf6777ab..9c0245baa 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -26,6 +26,7 @@ Bugs fixed
 ----------
 - Bug 1736 - default dot11EDCATableMSDULifetime
 - Bug 2126 - LrWpanNetDevice silently accepts no mobility on the node
+- Bug 2135 - TCP doesn't honor the socket's output interface
 - Bug 2136 - The usage of tid in wifi and wave module shall be "if (tid > 7)" rather than "if (tid >= 7)"
 
 Known issues
diff --git a/src/internet/model/tcp-l4-protocol.cc b/src/internet/model/tcp-l4-protocol.cc
index 35a311084..0e90ad149 100644
--- a/src/internet/model/tcp-l4-protocol.cc
+++ b/src/internet/model/tcp-l4-protocol.cc
@@ -541,7 +541,6 @@ TcpL4Protocol::Send (Ptr<Packet> packet,
       header.SetProtocol (PROT_NUMBER);
       Socket::SocketErrno errno_;
       Ptr<Ipv4Route> route;
-      Ptr<NetDevice> oif (0); //specify non-zero if bound to a source address
       if (ipv4->GetRoutingProtocol () != 0)
         {
           route = ipv4->GetRoutingProtocol ()->RouteOutput (packet, header, oif, errno_);
@@ -585,7 +584,6 @@ TcpL4Protocol::Send (Ptr<Packet> packet,
       header.SetNextHeader (PROT_NUMBER);
       Socket::SocketErrno errno_;
       Ptr<Ipv6Route> route;
-      Ptr<NetDevice> oif (0); //specify non-zero if bound to a source address
       if (ipv6->GetRoutingProtocol () != 0)
         {
           route = ipv6->GetRoutingProtocol ()->RouteOutput (packet, header, oif, errno_);