[PR #4] [MERGED] Upstream merge #100

New issue

Closed

opened 2026-10-13 21:03:38 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-13 21:03:38 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amneziawg-go/pull/4
Author: @leninalive
Created: 11/17/2023
Status: ✅ Merged
Merged: 11/30/2023
Merged by: @pokamest

Base: master ← Head: upstream-merge

📝 Commits (10+)

6a84778 conn, device: use UDP GSO and GRO on Linux
4201e08 device: distribute crypto work as slice of elements
895d6c2 tun: unwind summing loop in checksumNoFold()
8a015f7 tun: reduce redundant checksumming in tcpGRO()
1ec454f device: move Queue{In,Out}boundElement Mutex to container type
ec8f6f8 tun: fix crash when ForceMTU is called after close
42ec952 go.mod,tun/netstack: bump gvisor
177caa7 conn: simplify supportsUDPOffload
24ea133 conn: harmonize GOOS checks between "linux" and "android"
5d37bd2 conn: separate gso and sticky control

📊 Changes

27 files changed (+1112 additions, -399 deletions)

View changed files

📝 conn/bind_std.go (+272 -136)
📝 conn/bind_std_test.go (+229 -1)
📝 conn/controlfns_linux.go (+8 -0)
➕ conn/errors_default.go (+12 -0)
➕ conn/errors_linux.go (+26 -0)
➕ conn/features_default.go (+15 -0)
➕ conn/features_linux.go (+29 -0)
➕ conn/gso_default.go (+21 -0)
➕ conn/gso_linux.go (+65 -0)
📝 conn/sticky_default.go (+6 -5)
📝 conn/sticky_linux.go (+3 -1)
📝 conn/sticky_linux_test.go (+5 -5)
📝 device/channels.go (+16 -16)
📝 device/device.go (+5 -5)
📝 device/peer.go (+4 -4)
📝 device/pools.go (+24 -20)
📝 device/queueconstants_android.go (+1 -1)
📝 device/receive.go (+43 -40)
📝 device/send.go (+77 -64)
📝 go.mod (+5 -5)

...and 7 more files

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/amnezia-vpn/amneziawg-go/pull/4 **Author:** [@leninalive](https://github.com/leninalive) **Created:** 11/17/2023 **Status:** ✅ Merged **Merged:** 11/30/2023 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `master` ← **Head:** `upstream-merge` --- ### 📝 Commits (10+) - [`6a84778`](https://github.com/amnezia-vpn/amneziawg-go/commit/6a84778f2ca810f5fb5cb078e001494f08d9085f) conn, device: use UDP GSO and GRO on Linux - [`4201e08`](https://github.com/amnezia-vpn/amneziawg-go/commit/4201e08f1dbb521e5555d96a3b6464a860466f5f) device: distribute crypto work as slice of elements - [`895d6c2`](https://github.com/amnezia-vpn/amneziawg-go/commit/895d6c23cd60bd0522c5b6598a69ad6c5f1ab3a7) tun: unwind summing loop in checksumNoFold() - [`8a015f7`](https://github.com/amnezia-vpn/amneziawg-go/commit/8a015f7c766564c21f6bef6fdddedce7e2ede830) tun: reduce redundant checksumming in tcpGRO() - [`1ec454f`](https://github.com/amnezia-vpn/amneziawg-go/commit/1ec454f253c068f74ba7a7aea34546c9819493c0) device: move Queue{In,Out}boundElement Mutex to container type - [`ec8f6f8`](https://github.com/amnezia-vpn/amneziawg-go/commit/ec8f6f82c20c617a3ea94478f2b5e4d49c6d3c2c) tun: fix crash when ForceMTU is called after close - [`42ec952`](https://github.com/amnezia-vpn/amneziawg-go/commit/42ec952eadc297efadc70b9911d5a59bcd2db4a6) go.mod,tun/netstack: bump gvisor - [`177caa7`](https://github.com/amnezia-vpn/amneziawg-go/commit/177caa7e4419d1b95bbf0423f6be6230c7101504) conn: simplify supportsUDPOffload - [`24ea133`](https://github.com/amnezia-vpn/amneziawg-go/commit/24ea13351eb7a06c3760f2eae18a484ce009fcf9) conn: harmonize GOOS checks between "linux" and "android" - [`5d37bd2`](https://github.com/amnezia-vpn/amneziawg-go/commit/5d37bd24e14e3fff6c1ce61e299480beb3d68c00) conn: separate gso and sticky control ### 📊 Changes **27 files changed** (+1112 additions, -399 deletions) <details> <summary>View changed files</summary> 📝 `conn/bind_std.go` (+272 -136) 📝 `conn/bind_std_test.go` (+229 -1) 📝 `conn/controlfns_linux.go` (+8 -0) ➕ `conn/errors_default.go` (+12 -0) ➕ `conn/errors_linux.go` (+26 -0) ➕ `conn/features_default.go` (+15 -0) ➕ `conn/features_linux.go` (+29 -0) ➕ `conn/gso_default.go` (+21 -0) ➕ `conn/gso_linux.go` (+65 -0) 📝 `conn/sticky_default.go` (+6 -5) 📝 `conn/sticky_linux.go` (+3 -1) 📝 `conn/sticky_linux_test.go` (+5 -5) 📝 `device/channels.go` (+16 -16) 📝 `device/device.go` (+5 -5) 📝 `device/peer.go` (+4 -4) 📝 `device/pools.go` (+24 -20) 📝 `device/queueconstants_android.go` (+1 -1) 📝 `device/receive.go` (+43 -40) 📝 `device/send.go` (+77 -64) 📝 `go.mod` (+5 -5) _...and 7 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

bsakaguchi

2026-10-13 21:03:38 +00:00