From 772fccacb4ffa0c06c7bbd9c27b97bde6e2d97aa Mon Sep 17 00:00:00 2001 From: Jeff Martin Date: Tue, 9 Jul 2024 13:57:10 -0700 Subject: [PATCH] netstack: remove stale TODOs for multicast forwarding Support for multicast forwarding was finished by nahurley@google.com in commit 7d3a75fa60f83bc211f194ebffb0a182f092a8bb. These TODOs are no longer applicable and can be removed Updates #7338 PiperOrigin-RevId: 650748952 --- pkg/tcpip/network/ipv4/ipv4.go | 3 --- pkg/tcpip/network/ipv6/ipv6.go | 3 --- pkg/tcpip/stack/stack.go | 4 ---- 3 files changed, 10 deletions(-) diff --git a/pkg/tcpip/network/ipv4/ipv4.go b/pkg/tcpip/network/ipv4/ipv4.go index 8b4e24ac3..e2721a4db 100644 --- a/pkg/tcpip/network/ipv4/ipv4.go +++ b/pkg/tcpip/network/ipv4/ipv4.go @@ -96,9 +96,6 @@ type endpoint struct { // multicastForwarding is set to forwardingEnabled when the endpoint has // forwarding enabled and forwardingDisabled when it is disabled. - // - // TODO(https://gvisor.dev/issue/7338): Implement support for multicast - //forwarding. Currently, setting this value to true is a no-op. multicastForwarding atomicbitops.Uint32 // mu protects below. diff --git a/pkg/tcpip/network/ipv6/ipv6.go b/pkg/tcpip/network/ipv6/ipv6.go index af20f6db5..5c97050a3 100644 --- a/pkg/tcpip/network/ipv6/ipv6.go +++ b/pkg/tcpip/network/ipv6/ipv6.go @@ -218,9 +218,6 @@ type endpoint struct { // multicastForwarding is set to forwardingEnabled when the endpoint has // forwarding enabled and forwardingDisabled when it is disabled. - // - // TODO(https://gvisor.dev/issue/7338): Implement support for multicast - // forwarding. Currently, setting this value to true is a no-op. multicastForwarding atomicbitops.Uint32 mu endpointMu diff --git a/pkg/tcpip/stack/stack.go b/pkg/tcpip/stack/stack.go index c3a6faff5..83079ef97 100644 --- a/pkg/tcpip/stack/stack.go +++ b/pkg/tcpip/stack/stack.go @@ -697,10 +697,6 @@ func (s *Stack) DisableMulticastForwardingForProtocol(protocol tcpip.NetworkProt // the specified NIC for the passed protocol. // // Returns the previous configuration on the NIC. -// -// TODO(https://gvisor.dev/issue/7338): Implement support for multicast -// forwarding. Currently, setting this value is a no-op and is not ready for -// use. func (s *Stack) SetNICMulticastForwarding(id tcpip.NICID, protocol tcpip.NetworkProtocolNumber, enable bool) (bool, tcpip.Error) { s.mu.RLock() defer s.mu.RUnlock()