From 341fec64ede3ee65b856e3e7a2bcec2513bdcac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= <66256922+daniel-weisse@users.noreply.github.com> Date: Tue, 10 Sep 2024 08:49:31 +0200 Subject: [PATCH] deps: upgrade golang.org/x/sys to v0.25.0 (#6) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Weiße --- WORKSPACE | 4 ++-- go.mod | 2 +- go.sum | 2 ++ pkg/xdp/xdp.go | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 57410dda7..863796a18 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -114,8 +114,8 @@ go_repository( go_repository( name = "org_golang_x_sys", importpath = "golang.org/x/sys", - sum = "h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=", - version = "v0.21.0", + sum = "h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=", + version = "v0.25.0", ) go_repository( diff --git a/go.mod b/go.mod index 436ef86db..487ddd3c4 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/vishvananda/netlink v1.1.1-0.20211118161826-650dca95af54 golang.org/x/mod v0.14.0 golang.org/x/sync v0.6.0 - golang.org/x/sys v0.21.0 + golang.org/x/sys v0.25.0 golang.org/x/time v0.5.0 golang.org/x/tools v0.16.1 google.golang.org/protobuf v1.32.0 diff --git a/go.sum b/go.sum index dc2f2e84b..a2b11bcc0 100644 --- a/go.sum +++ b/go.sum @@ -356,6 +356,8 @@ golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= diff --git a/pkg/xdp/xdp.go b/pkg/xdp/xdp.go index b54cd2705..e7bf115a5 100644 --- a/pkg/xdp/xdp.go +++ b/pkg/xdp/xdp.go @@ -153,9 +153,9 @@ func NewFromSocket(sockfd int, ifaceIdx, queueID uint32, opts Opts) (*ControlBlo } reg := unix.XDPUmemReg{ - Addr: uint64(sliceBackingPointer(umemMemory)), - Len: uint64(len(umemMemory)), - Chunk_size: opts.FrameSize, + Addr: uint64(sliceBackingPointer(umemMemory)), + Len: uint64(len(umemMemory)), + Size: opts.FrameSize, // Not useful in the RX path. Headroom: 0, // TODO(b/240191988): Investigate use of SHARED flag.