From b4caeaf78f533037d191b61fc83919a3ecd379d1 Mon Sep 17 00:00:00 2001
From: Ghanan Gowripalan <ghanan@google.com>
Date: Tue, 13 Jul 2021 10:19:29 -0700
Subject: Deflake TestRouterSolicitation

Before this change, transmission of the first router solicitation races
with the adding of an IPv6 link-local address. This change creates the
NIC in the disabled state and is only enabled after the address is added
(if required) to avoid this race.

PiperOrigin-RevId: 384493553
---
 pkg/tcpip/stack/ndp_test.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'pkg/tcpip/stack/ndp_test.go')

diff --git a/pkg/tcpip/stack/ndp_test.go b/pkg/tcpip/stack/ndp_test.go
index ca2250ad6..4d5431da1 100644
--- a/pkg/tcpip/stack/ndp_test.go
+++ b/pkg/tcpip/stack/ndp_test.go
@@ -5356,8 +5356,9 @@ func TestRouterSolicitation(t *testing.T) {
 						RandSource: &randSource,
 					})
 
-					if err := s.CreateNIC(nicID, &e); err != nil {
-						t.Fatalf("CreateNIC(%d, _) = %s", nicID, err)
+					opts := stack.NICOptions{Disabled: true}
+					if err := s.CreateNICWithOptions(nicID, &e, opts); err != nil {
+						t.Fatalf("CreateNICWithOptions(%d, _, %#v) = %s", nicID, opts, err)
 					}
 
 					if addr := test.nicAddr; addr != "" {
@@ -5366,6 +5367,10 @@ func TestRouterSolicitation(t *testing.T) {
 						}
 					}
 
+					if err := s.EnableNIC(nicID); err != nil {
+						t.Fatalf("EnableNIC(%d): %s", nicID, err)
+					}
+
 					// Make sure each RS is sent at the right time.
 					remaining := test.maxRtrSolicit
 					if remaining != 0 {
-- 
cgit v1.2.3