diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2011-11-04 04:21:38 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-04 18:37:23 -0400 |
commit | 589665f5a6008dbce1d0af2cb93e94a80bf78151 (patch) | |
tree | 4f4ec1949dd233a8474c2cb477da3637166b6e75 /drivers | |
parent | 27d240fdae2808d727ad9ce48ec029731a457524 (diff) |
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: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 4 | ||||
-rw-r--r-- | drivers/net/bonding/bond_procfs.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index b2b9109b6712..b0c577256487 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -560,8 +560,8 @@ static int bond_update_speed_duplex(struct slave *slave) | |||
560 | u32 slave_speed; | 560 | u32 slave_speed; |
561 | int res; | 561 | int res; |
562 | 562 | ||
563 | slave->speed = -1; | 563 | slave->speed = SPEED_UNKNOWN; |
564 | slave->duplex = -1; | 564 | slave->duplex = DUPLEX_UNKNOWN; |
565 | 565 | ||
566 | res = __ethtool_get_settings(slave_dev, &ecmd); | 566 | res = __ethtool_get_settings(slave_dev, &ecmd); |
567 | if (res < 0) | 567 | if (res < 0) |
diff --git a/drivers/net/bonding/bond_procfs.c b/drivers/net/bonding/bond_procfs.c index d2ff52e63cbb..17206da2fab7 100644 --- a/drivers/net/bonding/bond_procfs.c +++ b/drivers/net/bonding/bond_procfs.c | |||
@@ -157,12 +157,12 @@ static void bond_info_show_slave(struct seq_file *seq, | |||
157 | seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name); | 157 | seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name); |
158 | seq_printf(seq, "MII Status: %s\n", | 158 | seq_printf(seq, "MII Status: %s\n", |
159 | (slave->link == BOND_LINK_UP) ? "up" : "down"); | 159 | (slave->link == BOND_LINK_UP) ? "up" : "down"); |
160 | if (slave->speed == -1) | 160 | if (slave->speed == SPEED_UNKNOWN) |
161 | seq_printf(seq, "Speed: %s\n", "Unknown"); | 161 | seq_printf(seq, "Speed: %s\n", "Unknown"); |
162 | else | 162 | else |
163 | seq_printf(seq, "Speed: %d Mbps\n", slave->speed); | 163 | seq_printf(seq, "Speed: %d Mbps\n", slave->speed); |
164 | 164 | ||
165 | if (slave->duplex == -1) | 165 | if (slave->duplex == DUPLEX_UNKNOWN) |
166 | seq_printf(seq, "Duplex: %s\n", "Unknown"); | 166 | seq_printf(seq, "Duplex: %s\n", "Unknown"); |
167 | else | 167 | else |
168 | seq_printf(seq, "Duplex: %s\n", slave->duplex ? "full" : "half"); | 168 | seq_printf(seq, "Duplex: %s\n", slave->duplex ? "full" : "half"); |