No need for a Container.networkManager field: it can be accessed via Container.runtime

container.go

@@ -32,7 +32,6 @@ type Container struct {
 	Image  string
 
 	network         *NetworkInterface
-	networkManager  *NetworkManager
 	NetworkSettings *NetworkSettings
 
 	SysInitPath string
@@ -266,7 +265,7 @@ func (container *Container) StderrPipe() (io.ReadCloser, error) {
 }
 
 func (container *Container) allocateNetwork() error {
-	iface, err := container.networkManager.Allocate()
+	iface, err := container.runtime.networkManager.Allocate()
 	if err != nil {
 		return err
 	}

runtime.go

@@ -115,7 +115,6 @@ func (runtime *Runtime) Register(container *Container) error {
 		return err
 	}
 	container.runtime = runtime
-	container.networkManager = runtime.networkManager // FIXME: infer from docker.runtime
 	// Setup state lock (formerly in newState()
 	lock := new(sync.Mutex)
 	container.State.stateChangeLock = lock