p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9149 from swagiaal/fix-configureBridge-comment

Browse Source 
Remove reference to 'ifaceName' from configureBridge comment.
Upstream-commit: a43ee077dca75d0e8f198275db17eac341b0ca8c
Component: engine
This commit is contained in:
Vincent Batts
2014-11-21 16:37:28 -05:00
parent 6951abbd89 9224549fdb
commit 95c96f42c9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/daemon/networkdriver/bridge/driver.go
View File

@ -253,9 +253,9 @@ func setupIPTables(addr net.Addr, icc, ipmasq bool) error {
return nil
}
// configureBridge attempts to create and configure a network bridge interface named `ifaceName` on the host
// configureBridge attempts to create and configure a network bridge interface named `bridgeIface` on the host
// If bridgeIP is empty, it will try to find a non-conflicting IP from the Docker-specified private ranges
// If the bridge `ifaceName` already exists, it will only perform the IP address association with the existing
// If the bridge `bridgeIface` already exists, it will only perform the IP address association with the existing
// bridge (fixes issue #8444)
// If an address which doesn't conflict with existing interfaces can't be found, an error is returned.
func configureBridge(bridgeIP string) error {