Skip to content

Commit

Permalink
Merge pull request moby#9149 from swagiaal/fix-configureBridge-comment
Browse files Browse the repository at this point in the history
Remove reference to 'ifaceName' from configureBridge comment.
  • Loading branch information
vbatts committed Nov 21, 2014
2 parents a527776 + a01f1e7 commit a43ee07
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions daemon/networkdriver/bridge/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit a43ee07

Please sign in to comment.