Merge release-20210607.0-52-g34152da7e (automated)

1 files changed, 0 insertions, 20 deletions

diff --git a/pkg/tcpip/transport/raw/endpoint.go b/pkg/tcpip/transport/raw/endpoint.go
index 1bce2769a..b6687911a 100644
--- a/pkg/tcpip/transport/raw/endpoint.go
+++ b/pkg/tcpip/transport/raw/endpoint.go
@@ -286,26 +286,6 @@ func (e *endpoint) write(p tcpip.Payloader, opts tcpip.WriteOptions) (int64, tcp
 			return nil, nil, nil, &tcpip.ErrBadBuffer{}
 		}
 
-		// If this is an unassociated socket and callee provided a nonzero
-		// destination address, route using that address.
-		if e.ops.GetHeaderIncluded() {
-			ip := header.IPv4(payloadBytes)
-			if !ip.IsValid(len(payloadBytes)) {
-				return nil, nil, nil, &tcpip.ErrInvalidOptionValue{}
-			}
-			dstAddr := ip.DestinationAddress()
-			// Update dstAddr with the address in the IP header, unless
-			// opts.To is set (e.g. if sendto specifies a specific
-			// address).
-			if dstAddr != tcpip.Address([]byte{0, 0, 0, 0}) && opts.To == nil {
-				opts.To = &tcpip.FullAddress{
-					NIC:  0,       // NIC is unset.
-					Addr: dstAddr, // The address from the payload.
-					Port: 0,       // There are no ports here.
-				}
-			}
-		}
-
 		// Did the user caller provide a destination? If not, use the connected
 		// destination.
 		if opts.To == nil {