diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-01-27 02:19:18 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-01-27 02:19:18 +0000 |
| commit | 14ee229ad6f1eb8c465dab899ffe4ba8a903c63f (patch) | |
| tree | 6dd19bbc90c3fe64843673b889c1fdaa39720a06 /pkg/tcpip/transport/icmp | |
| parent | 361ef9f80f978727027a2a8d7c4ccc32a8536bd1 (diff) | |
| parent | 8e660447410117edd49f41f7aa758e49254ae2d5 (diff) | |
Merge release-20210112.0-98-g8e6604474 (automated)
Diffstat (limited to 'pkg/tcpip/transport/icmp')
| -rw-r--r-- | pkg/tcpip/transport/icmp/endpoint.go | 6 | ||||
| -rw-r--r-- | pkg/tcpip/transport/icmp/endpoint_state.go | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/tcpip/transport/icmp/endpoint.go b/pkg/tcpip/transport/icmp/endpoint.go index c3d1252b1..e4bcd3120 100644 --- a/pkg/tcpip/transport/icmp/endpoint.go +++ b/pkg/tcpip/transport/icmp/endpoint.go @@ -96,13 +96,13 @@ func newEndpoint(s *stack.Stack, netProto tcpip.NetworkProtocolNumber, transProt state: stateInitial, uniqueID: s.UniqueID(), } - ep.ops.InitHandler(ep, ep.stack) - ep.ops.SetSendBufferSize(32*1024, false /* notify */, tcpip.GetStackSendBufferLimits) + ep.ops.InitHandler(ep, ep.stack, tcpip.GetStackSendBufferLimits) + ep.ops.SetSendBufferSize(32*1024, false /* notify */) // Override with stack defaults. var ss tcpip.SendBufferSizeOption if err := s.Option(&ss); err == nil { - ep.ops.SetSendBufferSize(int64(ss.Default), false /* notify */, tcpip.GetStackSendBufferLimits) + ep.ops.SetSendBufferSize(int64(ss.Default), false /* notify */) } return ep, nil } diff --git a/pkg/tcpip/transport/icmp/endpoint_state.go b/pkg/tcpip/transport/icmp/endpoint_state.go index 9335cbc5a..afe96998a 100644 --- a/pkg/tcpip/transport/icmp/endpoint_state.go +++ b/pkg/tcpip/transport/icmp/endpoint_state.go @@ -69,7 +69,7 @@ func (e *endpoint) afterLoad() { // Resume implements tcpip.ResumableEndpoint.Resume. func (e *endpoint) Resume(s *stack.Stack) { e.stack = s - e.ops.InitHandler(e, e.stack) + e.ops.InitHandler(e, e.stack, tcpip.GetStackSendBufferLimits) if e.state != stateBound && e.state != stateConnected { return |