[PR #9] [CLOSED] Merge upstream changes #103

New issue

Closed

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

bsakaguchi commented

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

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amneziawg-go/pull/9
Author: @leninalive
Created: 1/9/2024
Status: ❌ Closed

Base: master ← Head: upstream-merge

📝 Commits (7)

1cf89f5 tun: fix Device.Read() buf length assumption on Windows
d0bc03c tun: implement UDP GSO/GRO for Linux
4ffa9c2 device: change Peer.endpoint locking to reduce contention
7c20311 device: reduce redundant per-packet overhead in RX path
542e565 device: do atomic 64-bit add outside of vector loop
12269c2 device: fix possible deadlock in close method
025bd4f Merge remote-tracking branch 'upstream/master' into upstream-merge

📊 Changes

14 files changed (+1368 additions, -691 deletions)

View changed files

📝 device/device.go (+4 -12)
📝 device/mobilequirks.go (+3 -3)
📝 device/peer.go (+35 -15)
📝 device/receive.go (+19 -7)
📝 device/sticky_linux.go (+15 -15)
📝 device/timers.go (+2 -10)
📝 device/uapi.go (+29 -35)
📝 tun/offload_linux.go (+464 -134)
➕ tun/offload_linux_test.go (+752 -0)
➖ tun/tcp_offload_linux_test.go (+0 -411)
➖ tun/testdata/fuzz/Fuzz_handleGRO/032aec0105f26f709c118365e4830d6dc087cab24cd1e154c2e790589a309b77 (+0 -8)
➖ tun/testdata/fuzz/Fuzz_handleGRO/0da283f9a2098dec30d1c86784411a8ce2e8e03aa3384105e581f2c67494700d (+0 -8)
📝 tun/tun_linux.go (+42 -29)
📝 tun/tun_windows.go (+3 -4)

📄 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/9 **Author:** [@leninalive](https://github.com/leninalive) **Created:** 1/9/2024 **Status:** ❌ Closed **Base:** `master` ← **Head:** `upstream-merge` --- ### 📝 Commits (7) - [`1cf89f5`](https://github.com/amnezia-vpn/amneziawg-go/commit/1cf89f5339b549236f38ce5fbc40f7bf993d9626) tun: fix Device.Read() buf length assumption on Windows - [`d0bc03c`](https://github.com/amnezia-vpn/amneziawg-go/commit/d0bc03c707974a84a672716c718f99fab49e7eb8) tun: implement UDP GSO/GRO for Linux - [`4ffa9c2`](https://github.com/amnezia-vpn/amneziawg-go/commit/4ffa9c20327b9471c3eeb142347f679b69f84648) device: change Peer.endpoint locking to reduce contention - [`7c20311`](https://github.com/amnezia-vpn/amneziawg-go/commit/7c20311b3d30b96576a95fec31f58e4d5e0d3234) device: reduce redundant per-packet overhead in RX path - [`542e565`](https://github.com/amnezia-vpn/amneziawg-go/commit/542e565baa776ed4c5c55b73ef9aa38d33d55197) device: do atomic 64-bit add outside of vector loop - [`12269c2`](https://github.com/amnezia-vpn/amneziawg-go/commit/12269c2761734b15625017d8565745096325392f) device: fix possible deadlock in close method - [`025bd4f`](https://github.com/amnezia-vpn/amneziawg-go/commit/025bd4fd1fdb49eeb902a510f0e4630d3952a57d) Merge remote-tracking branch 'upstream/master' into upstream-merge ### 📊 Changes **14 files changed** (+1368 additions, -691 deletions) <details> <summary>View changed files</summary> 📝 `device/device.go` (+4 -12) 📝 `device/mobilequirks.go` (+3 -3) 📝 `device/peer.go` (+35 -15) 📝 `device/receive.go` (+19 -7) 📝 `device/sticky_linux.go` (+15 -15) 📝 `device/timers.go` (+2 -10) 📝 `device/uapi.go` (+29 -35) 📝 `tun/offload_linux.go` (+464 -134) ➕ `tun/offload_linux_test.go` (+752 -0) ➖ `tun/tcp_offload_linux_test.go` (+0 -411) ➖ `tun/testdata/fuzz/Fuzz_handleGRO/032aec0105f26f709c118365e4830d6dc087cab24cd1e154c2e790589a309b77` (+0 -8) ➖ `tun/testdata/fuzz/Fuzz_handleGRO/0da283f9a2098dec30d1c86784411a8ce2e8e03aa3384105e581f2c67494700d` (+0 -8) 📝 `tun/tun_linux.go` (+42 -29) 📝 `tun/tun_windows.go` (+3 -4) </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:40 +00:00