diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-11-16 22:39:16 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-11-16 22:39:16 +0000 |
| commit | 06e77263c317c7b00c6d274e16faacdad87f53e0 (patch) | |
| tree | 0df104b48db616eceda14d938fadaa15ba6ace7c /runsc | |
| parent | d2e975b6308a95c3e55b395a41b633c29dd674fc (diff) | |
| parent | cc5cfce4c6c9df1a44433681b87d411a67b09b28 (diff) | |
Merge release-20201109.0-51-gcc5cfce4c (automated)
Diffstat (limited to 'runsc')
| -rw-r--r-- | runsc/boot/network.go | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/runsc/boot/network.go b/runsc/boot/network.go index 988573640..f58b09942 100644 --- a/runsc/boot/network.go +++ b/runsc/boot/network.go @@ -28,7 +28,6 @@ import ( "gvisor.dev/gvisor/pkg/tcpip/link/packetsocket" "gvisor.dev/gvisor/pkg/tcpip/link/qdisc/fifo" "gvisor.dev/gvisor/pkg/tcpip/link/sniffer" - "gvisor.dev/gvisor/pkg/tcpip/network/arp" "gvisor.dev/gvisor/pkg/tcpip/network/ipv4" "gvisor.dev/gvisor/pkg/tcpip/network/ipv6" "gvisor.dev/gvisor/pkg/tcpip/stack" @@ -271,11 +270,6 @@ func (n *Network) createNICWithAddrs(id tcpip.NICID, name string, ep stack.LinkE return fmt.Errorf("CreateNICWithOptions(%d, _, %+v) failed: %v", id, opts, err) } - // Always start with an arp address for the NIC. - if err := n.Stack.AddAddress(id, arp.ProtocolNumber, arp.ProtocolAddress); err != nil { - return fmt.Errorf("AddAddress(%v, %v, %v) failed: %v", id, arp.ProtocolNumber, arp.ProtocolAddress, err) - } - for _, addr := range addrs { proto, tcpipAddr := ipToAddressAndProto(addr) if err := n.Stack.AddAddress(id, proto, tcpipAddr); err != nil { |