Skip to content

Commit 6705191

Browse files
committed
syscall: drop fallback to accept in Accept on Linux
The minimum required Linux kernel version for Go 1.18 will be changed to 2.6.32, see #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 #45964 Change-Id: I78fc4e5b58417bbc540912c9dbf1b1b3db888fea Reviewed-on: https://go-review.googlesource.com/c/go/+/346849 Trust: Tobias Klauser <[email protected]> Run-TryBot: Tobias Klauser <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Brad Fitzpatrick <[email protected]>
1 parent 17e9d14 commit 6705191

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

src/syscall/syscall_linux.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -542,11 +542,7 @@ func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) {
542542
func Accept(fd int) (nfd int, sa Sockaddr, err error) {
543543
var rsa RawSockaddrAny
544544
var len _Socklen = SizeofSockaddrAny
545-
// Try accept4 first for Android, then try accept for kernel older than 2.6.28
546545
nfd, err = accept4(fd, &rsa, &len, 0)
547-
if err == ENOSYS {
548-
nfd, err = accept(fd, &rsa, &len)
549-
}
550546
if err != nil {
551547
return
552548
}

0 commit comments

Comments
 (0)