Merge branch '2.6'

weaveworks · Jun 10, 2020 · 1ff09fd · 1ff09fd
2 parents 88799b3 + e034823
commit 1ff09fd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## Release 2.6.5
+
+Fixes a bug that would leak memory every time a fast-datapath connection
+was stopped. #3808
+Also avoid a crash when the machine has ipv6 disabled. #3815
+
+
 ## Release 2.6.4
 
 Improves the iptables rule added in 2.6.3 to block just the Weave Net

diff --git a/router/overlay_switch.go b/router/overlay_switch.go
@@ -452,6 +452,7 @@ func (fwd *overlaySwitchForwarder) Stop() {
 	fwd.lock.Lock()
 	defer fwd.lock.Unlock()
 	fwd.stopFrom(0)
+	close(fwd.stopChan)
 }
 
 func (fwd *overlaySwitchForwarder) ControlMessage(tag byte, msg []byte) {