Merge tag 'v1.72.1' into sunos-1.72

Release 1.72.1
nshalman · Aug 25, 2024 · 9a90bca · 9a90bca
2 parents a45af6c + f4a9566
commit 9a90bca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-1.72.0
+1.72.1
diff --git a/wgengine/netstack/netstack.go b/wgengine/netstack/netstack.go
@@ -329,7 +329,8 @@ func Create(logf logger.Logf, tundev *tstun.Wrapper, e wgengine.Engine, mc *magi
 		// TODO(jwhited): add Windows GSO support https://github.com/tailscale/corp/issues/21874
 		// TODO(jwhited): exercise enableGRO in relation to https://github.com/tailscale/corp/issues/22353
 		linkEP = newLinkEndpoint(512, uint32(tstun.DefaultTUNMTU()), "", disableGRO)
-		linkEP.SupportedGSOKind = stack.HostGSOSupported
+		// TODO(jwhited): re-enable GSO https://github.com/tailscale/corp/issues/22511
+		linkEP.SupportedGSOKind = stack.GSONotSupported
 	} else {
 		linkEP = newLinkEndpoint(512, uint32(tstun.DefaultTUNMTU()), "", disableGRO)
 	}