Merge release-20210806.0-45-g3b4bb9475 (automated)

1 files changed, 14 insertions, 16 deletions

diff --git a/pkg/tcpip/transport/raw/endpoint.go b/pkg/tcpip/transport/raw/endpoint.go
index b3d8951ff..55854ba59 100644
--- a/pkg/tcpip/transport/raw/endpoint.go
+++ b/pkg/tcpip/transport/raw/endpoint.go
@@ -321,28 +321,26 @@ func (e *endpoint) write(p tcpip.Payloader, opts tcpip.WriteOptions) (int64, tcp
 	}
 	defer route.Release()
 
+	pkt := stack.NewPacketBuffer(stack.PacketBufferOptions{
+		ReserveHeaderBytes: int(route.MaxHeaderLength()),
+		Data:               buffer.View(payloadBytes).ToVectorisedView(),
+	})
+	pkt.Owner = owner
+
 	if e.ops.GetHeaderIncluded() {
-		pkt := stack.NewPacketBuffer(stack.PacketBufferOptions{
-			Data: buffer.View(payloadBytes).ToVectorisedView(),
-		})
 		if err := route.WriteHeaderIncludedPacket(pkt); err != nil {
 			return 0, err
 		}
-	} else {
-		pkt := stack.NewPacketBuffer(stack.PacketBufferOptions{
-			ReserveHeaderBytes: int(route.MaxHeaderLength()),
-			Data:               buffer.View(payloadBytes).ToVectorisedView(),
-		})
-		pkt.Owner = owner
-		if err := route.WritePacket(stack.NetworkHeaderParams{
-			Protocol: e.TransProto,
-			TTL:      route.DefaultTTL(),
-			TOS:      stack.DefaultTOS,
-		}, pkt); err != nil {
-			return 0, err
-		}
+		return int64(len(payloadBytes)), nil
 	}
 
+	if err := route.WritePacket(stack.NetworkHeaderParams{
+		Protocol: e.TransProto,
+		TTL:      route.DefaultTTL(),
+		TOS:      stack.DefaultTOS,
+	}, pkt); err != nil {
+		return 0, err
+	}
 	return int64(len(payloadBytes)), nil
 }