Skip to content

Commit 97244b9

Browse files
committed
unix: drop fallback to accept in Accept on Linux
Same as CL 346849 does for package syscall. The minimum required Linux kernel version for Go 1.18 will be changed to 2.6.32, see golang/go#45964. The current minimum required version is 2.6.23 and accept4 was added in 2.6.28, so the fallback to accept in Accept on Linux can be removed. For golang/go#45964 Change-Id: Idf915d5a24cf570a2cfa0f0548c1841f3fc64d5a Reviewed-on: https://go-review.googlesource.com/c/sys/+/347329 Trust: Tobias Klauser <[email protected]> Run-TryBot: Tobias Klauser <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Matt Layher <[email protected]>
1 parent 2934436 commit 97244b9

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

Diff for: unix/syscall_linux.go

-4
Original file line numberDiff line numberDiff line change
@@ -1209,11 +1209,7 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
12091209
func Accept(fd int) (nfd int, sa Sockaddr, err error) {
12101210
var rsa RawSockaddrAny
12111211
var len _Socklen = SizeofSockaddrAny
1212-
// Try accept4 first for Android, then try accept for kernel older than 2.6.28
12131212
nfd, err = accept4(fd, &rsa, &len, 0)
1214-
if err == ENOSYS {
1215-
nfd, err = accept(fd, &rsa, &len)
1216-
}
12171213
if err != nil {
12181214
return
12191215
}

0 commit comments

Comments
 (0)