diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-05-11 19:14:29 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-05-11 19:14:29 +0000 |
| commit | 374762615df60a84047c1c3db6d843b186a4a1de (patch) | |
| tree | 0e0a12d49c275c8bae00823bad35921324f32b64 | |
| parent | aa7d16068c3e0425bb2c8cb3135ebc68ab214b61 (diff) | |
| parent | e838e7ab3406ff55faf034f67fe91a31cca18ab5 (diff) | |
Merge release-20200422.0-66-ge838e7a (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 be9fec3b3..54432194d 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 0216e9481..0625a06e0 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", "none", "specifies which queueing discipline to apply by default to the non loopback nics used by the sandbox.") + qDisc = flag.String("qdisc", "fifo", "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.") |