diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-09-12 20:54:26 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-09-12 20:54:26 +0000 |
| commit | 3fad3a099b37e0019c66b0c11de9aab695d49981 (patch) | |
| tree | 40abe4b8b80948d378ae3fda1aa98e4825a24247 /pkg/tcpip/stack/stack.go | |
| parent | a15a7afd5925c3b5d5f9b2f3b949612077dbacec (diff) | |
| parent | 857940d30d3a8dbb099bad43954fe8062b70461d (diff) | |
Merge release-20190806.1-138-g857940d (automated)
Diffstat (limited to 'pkg/tcpip/stack/stack.go')
| -rw-r--r-- | pkg/tcpip/stack/stack.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/tcpip/stack/stack.go b/pkg/tcpip/stack/stack.go index 1fe21b68e..a961e8ebe 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 { - return n.enable() + n.attachLinkEndpoint() } return nil @@ -680,7 +680,9 @@ func (s *Stack) EnableNIC(id tcpip.NICID) *tcpip.Error { return tcpip.ErrUnknownNICID } - return nic.enable() + nic.attachLinkEndpoint() + + return nil } // CheckNIC checks if a NIC is usable. |