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

Commit 589665f5 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

bonding: comparing a u8 with -1 is always false 



slave->duplex is a u8 type so the in bond_info_show_slave() when we
check "if (slave->duplex == -1)", it's always false.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 27d240fd

drivers/net/bonding/bond_main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -560,8 +560,8 @@ static int bond_update_speed_duplex(struct slave *slave) 
	u32 slave_speed;

	u32 slave_speed;

	int res;

	int res;





	slave->speed = -1;

	slave->speed = SPEED_UNKNOWN;

	slave->duplex = -1;

	slave->duplex = DUPLEX_UNKNOWN;





	res = __ethtool_get_settings(slave_dev, &ecmd);

	res = __ethtool_get_settings(slave_dev, &ecmd);

	if (res < 0)

	if (res < 0)

drivers/net/bonding/bond_procfs.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -157,12 +157,12 @@ static void bond_info_show_slave(struct seq_file *seq, 
	seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);

	seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);

	seq_printf(seq, "MII Status: %s\n",

	seq_printf(seq, "MII Status: %s\n",

		   (slave->link == BOND_LINK_UP) ?  "up" : "down");

		   (slave->link == BOND_LINK_UP) ?  "up" : "down");

	if (slave->speed == -1)

	if (slave->speed == SPEED_UNKNOWN)

		seq_printf(seq, "Speed: %s\n", "Unknown");

		seq_printf(seq, "Speed: %s\n", "Unknown");

	else

	else

		seq_printf(seq, "Speed: %d Mbps\n", slave->speed);

		seq_printf(seq, "Speed: %d Mbps\n", slave->speed);





	if (slave->duplex == -1)

	if (slave->duplex == DUPLEX_UNKNOWN)

		seq_printf(seq, "Duplex: %s\n", "Unknown");

		seq_printf(seq, "Duplex: %s\n", "Unknown");

	else

	else

		seq_printf(seq, "Duplex: %s\n", slave->duplex ? "full" : "half");

		seq_printf(seq, "Duplex: %s\n", slave->duplex ? "full" : "half");

include/linux/ethtool.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -1097,10 +1097,12 @@ struct ethtool_ops { 
#define SPEED_1000		1000

#define SPEED_1000		1000

#define SPEED_2500		2500

#define SPEED_2500		2500

#define SPEED_10000		10000

#define SPEED_10000		10000

#define SPEED_UNKNOWN		-1





/* Duplex, half or full. */

/* Duplex, half or full. */

#define DUPLEX_HALF		0x00

#define DUPLEX_HALF		0x00

#define DUPLEX_FULL		0x01

#define DUPLEX_FULL		0x01

#define DUPLEX_UNKNOWN		0xff





/* Which connector port. */

/* Which connector port. */

#define PORT_TP			0x00

#define PORT_TP			0x00