libn/osl: drop unused AddNeighbor force parameter

corhere · corhere · commit 3bdf99d127d9 · 2025-05-27T11:30:30.000-04:00
func (*Namespace) AddNeighbor is only ever called with the force
parameter set to false. Remove the parameter and eliminate dead code.

Signed-off-by: Cory Snider &lt;csnider@mirantis.com&gt;
diff --git a/libnetwork/drivers/overlay/peerdb.go b/libnetwork/drivers/overlay/peerdb.go
@@ -321,7 +321,7 @@ func (d *driver) peerAddOp(nid, eid string, peerIP net.IP, peerIPMask net.IPMask
 	}
 
 	// Add neighbor entry for the peer IP
-	if err := sbox.AddNeighbor(peerIP, peerMac, false, osl.WithLinkName(s.vxlanName)); err != nil {
+	if err := sbox.AddNeighbor(peerIP, peerMac, osl.WithLinkName(s.vxlanName)); err != nil {
 		if _, ok := err.(osl.NeighborSearchError); ok && dbEntries > 1 {
 			// We are in the transient case so only the first configuration is programmed into the kernel
 			// Upon deletion if the active configuration is deleted the next one from the database will be restored
@@ -332,7 +332,7 @@ func (d *driver) peerAddOp(nid, eid string, peerIP net.IP, peerIPMask net.IPMask
 	}
 
 	// Add fdb entry to the bridge for the peer mac
-	if err := sbox.AddNeighbor(vtep, peerMac, false, osl.WithLinkName(s.vxlanName), osl.WithFamily(syscall.AF_BRIDGE)); err != nil {
+	if err := sbox.AddNeighbor(vtep, peerMac, osl.WithLinkName(s.vxlanName), osl.WithFamily(syscall.AF_BRIDGE)); err != nil {
 		return fmt.Errorf("could not add fdb entry for nid:%s eid:%s into the sandbox:%v", nid, eid, err)
 	}
 
diff --git a/libnetwork/osl/neigh_linux.go b/libnetwork/osl/neigh_linux.go
@@ -110,22 +110,16 @@ func (n *Namespace) DeleteNeighbor(dstIP net.IP, dstMac net.HardwareAddr) error
 }
 
 // AddNeighbor adds a neighbor entry into the sandbox.
-func (n *Namespace) AddNeighbor(dstIP net.IP, dstMac net.HardwareAddr, force bool, options ...NeighOption) error {
+func (n *Namespace) AddNeighbor(dstIP net.IP, dstMac net.HardwareAddr, options ...NeighOption) error {
 	var (
-		iface                  netlink.Link
-		err                    error
-		neighborAlreadyPresent bool
+		iface netlink.Link
+		err   error
 	)
 
-	// If the namespace already has the neighbor entry but the AddNeighbor is called
-	// because of a miss notification (force flag) program the kernel anyway.
 	nh := n.findNeighbor(dstIP, dstMac)
 	if nh != nil {
-		neighborAlreadyPresent = true
-		log.G(context.TODO()).Warnf("Neighbor entry already present for IP %v, mac %v neighbor:%+v forceUpdate:%t", dstIP, dstMac, nh, force)
-		if !force {
-			return NeighborSearchError{dstIP, dstMac, true}
-		}
+		log.G(context.TODO()).Warnf("Neighbor entry already present for IP %v, mac %v neighbor:%+v", dstIP, dstMac, nh)
+		return NeighborSearchError{dstIP, dstMac, true}
 	}
 
 	nh = &neigh{
@@ -172,10 +166,6 @@ func (n *Namespace) AddNeighbor(dstIP net.IP, dstMac net.HardwareAddr, force boo
 		return fmt.Errorf("could not add neighbor entry:%+v error:%v", nlnh, err)
 	}
 
-	if neighborAlreadyPresent {
-		return nil
-	}
-
 	n.mu.Lock()
 	n.neighbors = append(n.neighbors, nh)
 	n.mu.Unlock()

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ func (d *driver) peerAddOp(nid, eid string, peerIP net.IP, peerIPMask net.IPMask`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`// Add neighbor entry for the peer IP`
`324`		`- if err := sbox.AddNeighbor(peerIP, peerMac, false, osl.WithLinkName(s.vxlanName)); err != nil {`
	`324`	`+ if err := sbox.AddNeighbor(peerIP, peerMac, osl.WithLinkName(s.vxlanName)); err != nil {`
`325`	`325`	`if _, ok := err.(osl.NeighborSearchError); ok && dbEntries > 1 {`
`326`	`326`	`// We are in the transient case so only the first configuration is programmed into the kernel`
`327`	`327`	`// Upon deletion if the active configuration is deleted the next one from the database will be restored`
`@@ -332,7 +332,7 @@ func (d *driver) peerAddOp(nid, eid string, peerIP net.IP, peerIPMask net.IPMask`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`// Add fdb entry to the bridge for the peer mac`
`335`		`- if err := sbox.AddNeighbor(vtep, peerMac, false, osl.WithLinkName(s.vxlanName), osl.WithFamily(syscall.AF_BRIDGE)); err != nil {`
	`335`	`+ if err := sbox.AddNeighbor(vtep, peerMac, osl.WithLinkName(s.vxlanName), osl.WithFamily(syscall.AF_BRIDGE)); err != nil {`
`336`	`336`	`return fmt.Errorf("could not add fdb entry for nid:%s eid:%s into the sandbox:%v", nid, eid, err)`
`337`	`337`	`}`
`338`	`338`