Merge pull request #3442 from weaveworks/issues/3336-promisc

net: Do not set bridge hw addr when creating it
This commit is contained in:
Bryan Boreham authored and GitHub committed 2018-11-01 21:09:34 +00:00
commit f53dfdea61
1 file changed
+4 -1
+4 -1
View File
@@ -309,7 +309,10 @@ func (b bridgeImpl) initPrep(config *BridgeConfig) error {
linkAttrs := netlink.NewLinkAttrs()
linkAttrs.Name = config.WeaveBridgeName
linkAttrs.HardwareAddr = mac
// NB: Do not set MAC addr when creating the bridge, set it manually
// afterwards instead. Otherwise, on an older than 3.14 kernel FDB
// entry won't be created which results in containers not being able to
// reach the bridge w/o promiscuous mode.
if config.MTU == 0 {
config.MTU = 65535
}