From 6bcd9e04aec19724442709b11345b447fdddf606 Mon Sep 17 00:00:00 2001 From: Jing Chen Date: Fri, 21 Jun 2024 12:03:20 -0700 Subject: [PATCH] Remove duplicate implementation of creating random MAC address. PiperOrigin-RevId: 645460859 --- pkg/tcpip/stack/bridge.go | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkg/tcpip/stack/bridge.go b/pkg/tcpip/stack/bridge.go index 0fdb94f13..9a70a9042 100644 --- a/pkg/tcpip/stack/bridge.go +++ b/pkg/tcpip/stack/bridge.go @@ -15,9 +15,6 @@ package stack import ( - "math/rand" - "net" - "gvisor.dev/gvisor/pkg/atomicbitops" "gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/tcpip/header" @@ -67,19 +64,11 @@ func (p *bridgePort) DeliverNetworkPacket(protocol tcpip.NetworkProtocolNumber, func (p *bridgePort) DeliverLinkPacket(protocol tcpip.NetworkProtocolNumber, pkt *PacketBuffer) { } -func getRandMacAddr() tcpip.LinkAddress { - mac := make(net.HardwareAddr, 6) - rand.Read(mac) // Fill with random data. - mac[0] &^= 0x1 // Clear multicast bit. - mac[0] |= 0x2 // Set local assignment bit (IEEE802). - return tcpip.LinkAddress(mac) -} - // NewBridgeEndpoint creates a new bridge endpoint. func NewBridgeEndpoint(mtu uint32) *BridgeEndpoint { b := &BridgeEndpoint{ mtu: mtu, - addr: getRandMacAddr(), + addr: tcpip.GetRandMacAddr(), } b.ports = make(map[tcpip.NICID]*bridgePort) return b