Commit 5c603001 authored by Mikael Barsehyan's avatar Mikael Barsehyan Committed by Tony Nguyen
Browse files

ice: remove non-inclusive language 



Remove non-inclusive language from the driver where
possible; replace "master" with "primary"; replace
"slave" with "secondary".

Signed-off-by: default avatarMikael Barsehyan <mikael.barsehyan@intel.com>
Tested-by: Gurucharan <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent e1e9db57

drivers/net/ethernet/intel/ice/ice_lag.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -61,13 +61,13 @@ static void ice_lag_set_backup(struct ice_lag *lag) 
 */

 */

static void ice_display_lag_info(struct ice_lag *lag)

static void ice_display_lag_info(struct ice_lag *lag)

{

{

	const char *name, *peer, *upper, *role, *bonded, *master;

	const char *name, *peer, *upper, *role, *bonded, *primary;

	struct device *dev = &lag->pf->pdev->dev;

	struct device *dev = &lag->pf->pdev->dev;





	name = lag->netdev ? netdev_name(lag->netdev) : "unset";

	name = lag->netdev ? netdev_name(lag->netdev) : "unset";

	peer = lag->peer_netdev ? netdev_name(lag->peer_netdev) : "unset";

	peer = lag->peer_netdev ? netdev_name(lag->peer_netdev) : "unset";

	upper = lag->upper_netdev ? netdev_name(lag->upper_netdev) : "unset";

	upper = lag->upper_netdev ? netdev_name(lag->upper_netdev) : "unset";

	master = lag->master ? "TRUE" : "FALSE";

	primary = lag->primary ? "TRUE" : "FALSE";

	bonded = lag->bonded ? "BONDED" : "UNBONDED";

	bonded = lag->bonded ? "BONDED" : "UNBONDED";





	switch (lag->role) {

	switch (lag->role) {
@@ -87,8 +87,8 @@ static void ice_display_lag_info(struct ice_lag *lag) 
		role = "ERROR";

		role = "ERROR";

	}

	}





	dev_dbg(dev, "%s %s, peer:%s, upper:%s, role:%s, master:%s\n", name,

	dev_dbg(dev, "%s %s, peer:%s, upper:%s, role:%s, primary:%s\n", name,

		bonded, peer, upper, role, master);

		bonded, peer, upper, role, primary);

}

}





/**

/**
@@ -119,7 +119,7 @@ static void ice_lag_info_event(struct ice_lag *lag, void *ptr) 
	}

	}





	if (strcmp(bonding_info->slave.slave_name, lag_netdev_name)) {

	if (strcmp(bonding_info->slave.slave_name, lag_netdev_name)) {

		netdev_dbg(lag->netdev, "Bonding event recv, but slave info not for us\n");

		netdev_dbg(lag->netdev, "Bonding event recv, but secondary info not for us\n");

		goto lag_out;

		goto lag_out;

	}

	}
@@ -164,8 +164,8 @@ ice_lag_link(struct ice_lag *lag, struct netdev_notifier_changeupper_info *info) 
	lag->bonded = true;

	lag->bonded = true;

	lag->role = ICE_LAG_UNSET;

	lag->role = ICE_LAG_UNSET;





	/* if this is the first element in an LAG mark as master */

	/* if this is the first element in an LAG mark as primary */

	lag->master = !!(peers == 1);

	lag->primary = !!(peers == 1);

}

}





/**

/**
@@ -264,7 +264,7 @@ static void ice_lag_changeupper_event(struct ice_lag *lag, void *ptr) 
	netdev_dbg(netdev, "bonding %s\n", info->linking ? "LINK" : "UNLINK");

	netdev_dbg(netdev, "bonding %s\n", info->linking ? "LINK" : "UNLINK");





	if (!netif_is_lag_master(info->upper_dev)) {

	if (!netif_is_lag_master(info->upper_dev)) {

		netdev_dbg(netdev, "changeupper rcvd, but not master. bail\n");

		netdev_dbg(netdev, "changeupper rcvd, but not primary. bail\n");

		return;

		return;

	}

	}

drivers/net/ethernet/intel/ice/ice_lag.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ struct ice_lag { 
	struct net_device *upper_netdev; /* upper bonding netdev */

	struct net_device *upper_netdev; /* upper bonding netdev */

	struct notifier_block notif_block;

	struct notifier_block notif_block;

	u8 bonded:1; /* currently bonded */

	u8 bonded:1; /* currently bonded */

	u8 master:1; /* this is a master */

	u8 primary:1; /* this is primary */

	u8 handler:1; /* did we register a rx_netdev_handler */

	u8 handler:1; /* did we register a rx_netdev_handler */

	/* each thing blocking bonding will increment this value by one.

	/* each thing blocking bonding will increment this value by one.

	 * If this value is zero, then bonding is allowed.

	 * If this value is zero, then bonding is allowed.