Merge pull request #460 from bisdn/jogo_fix_l2_move_learn

fix setup learning for ports
bisdn · Feb 14, 2025 · 7737d74 · 7737d74
2 parents ec5fba8 + 7170e72
commit 7737d74
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/netlink/cnetlink.cc b/src/netlink/cnetlink.cc
@@ -1473,6 +1473,12 @@ void cnetlink::link_created(rtnl_link *link) noexcept {
 
       port_man->set_offloaded(link, FLAGS_mark_fwd_offload);
       swi->port_set_config(port_id, port_man->get_hwaddr(port_id), false);
+      swi->port_set_learn(
+          port_id, switch_interface::
+                       SAI_BRIDGE_PORT_FDB_LEARNING_MODE_FDB_LOG_NOTIFICATION);
+      swi->port_set_move_learn(
+          port_id, switch_interface::
+                       SAI_BRIDGE_PORT_FDB_LEARNING_MODE_FDB_LOG_NOTIFICATION);
     } else {
       LOG(WARNING) << __FUNCTION__ << ": ignoring link with lt=" << lt
                    << " link:" << link;

diff --git a/src/netlink/nbi_impl.cc b/src/netlink/nbi_impl.cc
@@ -52,14 +52,6 @@ void nbi_impl::port_notification(
     case PORT_EVENT_TABLE:
       switch (get_port_type(ntfy.port_id)) {
       case nbi::port_type_physical:
-        swi->port_set_learn(
-            ntfy.port_id,
-            switch_interface::
-                SAI_BRIDGE_PORT_FDB_LEARNING_MODE_FDB_LOG_NOTIFICATION);
-        swi->port_set_move_learn(
-            ntfy.port_id,
-            switch_interface::
-                SAI_BRIDGE_PORT_FDB_LEARNING_MODE_FDB_LOG_NOTIFICATION);
         port_man->create_portdev(ntfy.port_id, ntfy.name, ntfy.hwaddr, *this);
         break;
       default:

diff --git a/src/of-dpa/controller.cc b/src/of-dpa/controller.cc
@@ -599,7 +599,7 @@ int controller::port_set_move_learn(
   if (rv)
     return rv;
 
-  return ofdpa->ofdpaPortSourceMacMoveLearningSet(port_id, l2_learn);
+  return ofdpa->ofdpaPortSourceMacMoveLearningSet(port_id, flags);
 }
 
 int controller::lag_create(uint32_t *lag_id, std::string name,