summaryrefslogtreecommitdiffhomepage
path: root/pkg/tcpip/stack/stack.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2019-09-17 21:49:11 +0000
committergVisor bot <gvisor-bot@google.com>2019-09-17 21:49:11 +0000
commitb3ea44cb5f02931e32bc383b3bf7eb5db5c951b6 (patch)
tree50a890a02def7bddf37894cb29fb7404ab9ac90e /pkg/tcpip/stack/stack.go
parentb408e5c29d9c514a5f79e90b84a6889546a007d2 (diff)
parent60fe8719e172f76aa5cfd8cd80a35c3e648701a3 (diff)
Merge release-20190806.1-153-g60fe871 (automated)
Diffstat (limited to 'pkg/tcpip/stack/stack.go')
-rw-r--r--pkg/tcpip/stack/stack.go6
1 files changed, 2 insertions, 4 deletions
diff --git a/pkg/tcpip/stack/stack.go b/pkg/tcpip/stack/stack.go
index a961e8ebe..1fe21b68e 100644
--- a/pkg/tcpip/stack/stack.go
+++ b/pkg/tcpip/stack/stack.go
@@ -633,7 +633,7 @@ func (s *Stack) createNIC(id tcpip.NICID, name string, ep LinkEndpoint, enabled,
s.nics[id] = n
if enabled {
- n.attachLinkEndpoint()
+ return n.enable()
}
return nil
@@ -680,9 +680,7 @@ func (s *Stack) EnableNIC(id tcpip.NICID) *tcpip.Error {
return tcpip.ErrUnknownNICID
}
- nic.attachLinkEndpoint()
-
- return nil
+ return nic.enable()
}
// CheckNIC checks if a NIC is usable.