diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-01-08 22:55:16 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-01-08 22:55:16 +0000 |
| commit | f9ca949e940b73cc27d706b0f76c13aa85a12e0a (patch) | |
| tree | 434e73db5e0cb700bd396dbcd01d81897c50e776 /runsc/boot | |
| parent | 079405305e69bc86831ae34911dd3dd73477f72e (diff) | |
| parent | e21c5840569155d39e8e11ac18cee99bc6d67469 (diff) | |
Merge release-20191213.0-77-ge21c584 (automated)
Diffstat (limited to 'runsc/boot')
| -rw-r--r-- | runsc/boot/network.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runsc/boot/network.go b/runsc/boot/network.go index 0240fe323..6a8765ec8 100644 --- a/runsc/boot/network.go +++ b/runsc/boot/network.go @@ -219,8 +219,9 @@ func (n *Network) CreateLinksAndRoutes(args *CreateLinksAndRoutesArgs, _ *struct // createNICWithAddrs creates a NIC in the network stack and adds the given // addresses. func (n *Network) createNICWithAddrs(id tcpip.NICID, name string, ep stack.LinkEndpoint, addrs []net.IP) error { - if err := n.Stack.CreateNamedNIC(id, name, sniffer.New(ep)); err != nil { - return fmt.Errorf("CreateNamedNIC(%v, %v, %v) failed: %v", id, name, ep, err) + opts := stack.NICOptions{Name: name} + if err := n.Stack.CreateNICWithOptions(id, sniffer.New(ep), opts); err != nil { + return fmt.Errorf("CreateNICWithOptions(%d, _, %+v) failed: %v", id, opts, err) } // Always start with an arp address for the NIC. |