diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-07 19:53:35 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-07 19:53:35 +0000 |
| commit | 03daf4f9759e35beea2663b171f134fc48dde512 (patch) | |
| tree | 0d8c3e40e81050c904f5264a7d4b650b33169e60 | |
| parent | a5732c2feea817d08a240baf1b78c850431cd5bd (diff) | |
| parent | 28b5565fdd87155dd5c37fff427884a772f01c72 (diff) | |
Merge release-20200422.0-50-g28b5565 (automated)
| -rwxr-xr-x | pkg/tcpip/link/qdisc/fifo/endpoint.go | 2 | ||||
| -rw-r--r-- | runsc/main.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/tcpip/link/qdisc/fifo/endpoint.go b/pkg/tcpip/link/qdisc/fifo/endpoint.go index 54432194d..be9fec3b3 100755 --- a/pkg/tcpip/link/qdisc/fifo/endpoint.go +++ b/pkg/tcpip/link/qdisc/fifo/endpoint.go @@ -163,7 +163,7 @@ func (e *endpoint) WritePacket(r *stack.Route, gso *stack.GSO, protocol tcpip.Ne // WritePackets implements stack.LinkEndpoint.WritePackets. // -// Being a batch API, each packet in pkts should have the following fields +// Being a batch API each packet in pkts should have the following fields // populated: // - pkt.EgressRoute // - pkt.GSOOptions diff --git a/runsc/main.go b/runsc/main.go index 0625a06e0..0216e9481 100644 --- a/runsc/main.go +++ b/runsc/main.go @@ -72,7 +72,7 @@ var ( network = flag.String("network", "sandbox", "specifies which network to use: sandbox (default), host, none. Using network inside the sandbox is more secure because it's isolated from the host network.") hardwareGSO = flag.Bool("gso", true, "enable hardware segmentation offload if it is supported by a network device.") softwareGSO = flag.Bool("software-gso", true, "enable software segmentation offload when hardware ofload can't be enabled.") - qDisc = flag.String("qdisc", "fifo", "specifies which queueing discipline to apply by default to the non loopback nics used by the sandbox.") + qDisc = flag.String("qdisc", "none", "specifies which queueing discipline to apply by default to the non loopback nics used by the sandbox.") fileAccess = flag.String("file-access", "exclusive", "specifies which filesystem to use for the root mount: exclusive (default), shared. Volume mounts are always shared.") fsGoferHostUDS = flag.Bool("fsgofer-host-uds", false, "allow the gofer to mount Unix Domain Sockets.") overlay = flag.Bool("overlay", false, "wrap filesystem mounts with writable overlay. All modifications are stored in memory inside the sandbox.") |