diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2021-09-01 15:50:27 +0200 |
|---|---|---|
| committer | Tobias Klauser <tobias.klauser@gmail.com> | 2021-09-02 09:25:10 +0000 |
| commit | 6705191e02d7e5e849a7877928003b797e0bc4f6 (patch) | |
| tree | 35f344648b6f012501dc493dc721427a731bf52d /src/syscall | |
| parent | 17e9d148d3354f8da745e6533213ca5b348b719e (diff) | |
| download | go-6705191e02d7e5e849a7877928003b797e0bc4f6.tar.gz go-6705191e02d7e5e849a7877928003b797e0bc4f6.zip | |
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 <tobias.klauser@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/syscall')
| -rw-r--r-- | src/syscall/syscall_linux.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/syscall/syscall_linux.go b/src/syscall/syscall_linux.go index a2dba54b97..6d428d58dd 100644 --- a/src/syscall/syscall_linux.go +++ b/src/syscall/syscall_linux.go @@ -542,11 +542,7 @@ func anyToSockaddr(rsa *RawSockaddrAny) (Sockaddr, error) { func Accept(fd int) (nfd int, sa Sockaddr, err error) { var rsa RawSockaddrAny var len _Socklen = SizeofSockaddrAny - // Try accept4 first for Android, then try accept for kernel older than 2.6.28 nfd, err = accept4(fd, &rsa, &len, 0) - if err == ENOSYS { - nfd, err = accept(fd, &rsa, &len) - } if err != nil { return } |