diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-10-30 22:37:35 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-10-30 22:37:35 +0000 |
| commit | faa77c102f347a1add771f212861ea7c161f3546 (patch) | |
| tree | 25af2488006421cfce8acc19926e1b53f9812c5f /runsc | |
| parent | 280585a8ce2cdea30c13c456cda0232030538291 (diff) | |
| parent | db37483cb6acf55b66132d534bb734f09555b1cf (diff) | |
Merge release-20190806.1-346-gdb37483 (automated)
Diffstat (limited to 'runsc')
| -rw-r--r-- | runsc/boot/loader.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go index 0c0eba99e..86df384f8 100644 --- a/runsc/boot/loader.go +++ b/runsc/boot/loader.go @@ -232,7 +232,7 @@ func New(args Args) (*Loader, error) { // this point. Netns is configured before Run() is called. Netstack is // configured using a control uRPC message. Host network is configured inside // Run(). - networkStack, err := newEmptyNetworkStack(args.Conf, k) + networkStack, err := newEmptyNetworkStack(args.Conf, k, k) if err != nil { return nil, fmt.Errorf("creating network: %v", err) } @@ -905,7 +905,7 @@ func (l *Loader) WaitExit() kernel.ExitStatus { return l.k.GlobalInit().ExitStatus() } -func newEmptyNetworkStack(conf *Config, clock tcpip.Clock) (inet.Stack, error) { +func newEmptyNetworkStack(conf *Config, clock tcpip.Clock, uniqueID stack.UniqueID) (inet.Stack, error) { switch conf.Network { case NetworkHost: return hostinet.NewStack(), nil @@ -923,6 +923,7 @@ func newEmptyNetworkStack(conf *Config, clock tcpip.Clock) (inet.Stack, error) { // Enable raw sockets for users with sufficient // privileges. RawFactory: raw.EndpointFactory{}, + UniqueID: uniqueID, })} // Enable SACK Recovery. |