Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9856909c authored by David Decotigny's avatar David Decotigny Committed by David S. Miller
Browse files

net: bonding: use __ethtool_get_ksettings 



Signed-off-by: default avatarDavid Decotigny <decot@googlers.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 96a0c396

drivers/net/bonding/bond_main.c

+6 −8
Original line number Diff line number Diff line
@@ -376,22 +376,20 @@ int bond_set_carrier(struct bonding *bond) 
static void bond_update_speed_duplex(struct slave *slave)

{

	struct net_device *slave_dev = slave->dev;

	struct ethtool_cmd ecmd;

	u32 slave_speed;

	struct ethtool_link_ksettings ecmd;

	int res;



	slave->speed = SPEED_UNKNOWN;

	slave->duplex = DUPLEX_UNKNOWN;



	res = __ethtool_get_settings(slave_dev, &ecmd);

	res = __ethtool_get_link_ksettings(slave_dev, &ecmd);

	if (res < 0)

		return;



	slave_speed = ethtool_cmd_speed(&ecmd);

	if (slave_speed == 0 || slave_speed == ((__u32) -1))

	if (ecmd.base.speed == 0 || ecmd.base.speed == ((__u32)-1))

		return;



	switch (ecmd.duplex) {

	switch (ecmd.base.duplex) {

	case DUPLEX_FULL:

	case DUPLEX_HALF:

		break;
@@ -399,8 +397,8 @@ static void bond_update_speed_duplex(struct slave *slave) 
		return;

	}



	slave->speed = slave_speed;

	slave->duplex = ecmd.duplex;

	slave->speed = ecmd.base.speed;

	slave->duplex = ecmd.base.duplex;



	return;

}