From 3406ebbb75cd98fd4c0adfdec199a3b942033408 Mon Sep 17 00:00:00 2001 From: Ayush Ranjan Date: Sat, 16 Dec 2023 09:46:14 -0800 Subject: [PATCH] Remove unused gonet.UDPConn.stack field. Fixes #7894 PiperOrigin-RevId: 591533496 --- pkg/tcpip/adapters/gonet/gonet.go | 14 ++++++-------- pkg/tcpip/adapters/gonet/gonet_test.go | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkg/tcpip/adapters/gonet/gonet.go b/pkg/tcpip/adapters/gonet/gonet.go index 5e91f3dd5..7dab48cc6 100644 --- a/pkg/tcpip/adapters/gonet/gonet.go +++ b/pkg/tcpip/adapters/gonet/gonet.go @@ -546,17 +546,15 @@ func DialContextTCP(ctx context.Context, s *stack.Stack, addr tcpip.FullAddress, type UDPConn struct { deadlineTimer - stack *stack.Stack - ep tcpip.Endpoint - wq *waiter.Queue + ep tcpip.Endpoint + wq *waiter.Queue } // NewUDPConn creates a new UDPConn. -func NewUDPConn(s *stack.Stack, wq *waiter.Queue, ep tcpip.Endpoint) *UDPConn { +func NewUDPConn(wq *waiter.Queue, ep tcpip.Endpoint) *UDPConn { c := &UDPConn{ - stack: s, - ep: ep, - wq: wq, + ep: ep, + wq: wq, } c.deadlineTimer.init() return c @@ -586,7 +584,7 @@ func DialUDP(s *stack.Stack, laddr, raddr *tcpip.FullAddress, network tcpip.Netw } } - c := NewUDPConn(s, &wq, ep) + c := NewUDPConn(&wq, ep) if raddr != nil { if err := c.ep.Connect(*raddr); err != nil { diff --git a/pkg/tcpip/adapters/gonet/gonet_test.go b/pkg/tcpip/adapters/gonet/gonet_test.go index 43bf263c7..c3ed4636d 100644 --- a/pkg/tcpip/adapters/gonet/gonet_test.go +++ b/pkg/tcpip/adapters/gonet/gonet_test.go @@ -489,7 +489,7 @@ func TestUDPForwarder(t *testing.T) { } defer ep.Close() - c := NewUDPConn(s, &wq, ep) + c := NewUDPConn(&wq, ep) buf := make([]byte, 256) n, e := c.Read(buf)