Recently OVS adopted a policy of using the inclusive naming word list v1
[1, 2].
This patch partially addresses the use of the term master in the
context of LAG devices by using the term primary instead: the
is_lag_master field of struct netdev_linux is renamed is_lag_primary.
A related comment is also updated.
No functional change intended.
[1] df5e5cf ("Documentation: Add section on inclusive language.")
[2] https://inclusivenaming.org/word-lists/
Signed-off-by: Simon Horman <[email protected]>
---
lib/netdev-linux-private.h | 2 +-
lib/netdev-linux.c | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/lib/netdev-linux-private.h b/lib/netdev-linux-private.h
index 188e8438a320..8e572e3b3b14 100644
--- a/lib/netdev-linux-private.h
+++ b/lib/netdev-linux-private.h
@@ -105,7 +105,7 @@ struct netdev_linux {
uint64_t rx_dropped; /* Packets dropped while recv from kernel. */
/* LAG information. */
- bool is_lag_master; /* True if the netdev is a LAG master. */
+ bool is_lag_primary; /* True if the netdev is a LAG primary. */
int numa_id; /* NUMA node id. */
diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c
index bf91ef462efb..1f996454d8f6 100644
--- a/lib/netdev-linux.c
+++ b/lib/netdev-linux.c
@@ -885,7 +885,7 @@ netdev_linux_update__(struct netdev_linux *dev,
}
if (change->primary && netdev_linux_kind_is_lag(change->primary)) {
- dev->is_lag_master = true;
+ dev->is_lag_primary = true;
}
dev->ifindex = change->if_index;
@@ -3703,8 +3703,9 @@ netdev_linux_get_block_id(struct netdev *netdev_)
netdev_linux_update_via_netlink(netdev);
}
- /* Only assigning block ids to linux netdevs that are LAG masters. */
- if (netdev->is_lag_master) {
+ /* Only assigning block ids to linux netdevs that are
+ * LAG primary members. */
+ if (netdev->is_lag_primary) {
block_id = netdev->ifindex;
}
ovs_mutex_unlock(&netdev->mutex);
@@ -6903,7 +6904,7 @@ netdev_linux_update_via_netlink(struct netdev_linux
*netdev)
changed = true;
}
if (change->primary && netdev_linux_kind_is_lag(change->primary)) {
- netdev->is_lag_master = true;
+ netdev->is_lag_primary = true;
}
if (changed) {
netdev_change_seq_changed(&netdev->up);
--
2.43.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
