net-bonding: Fix minor/cosmetic type inconsistencies

The __get_link_speed() function returns a u16 value which was stored
in a u32 local variable. This patch uses the return value directly,
thus fixing that minor type consistency.

The 'duplex' field in struct slave being encoded on 8 bits, to be more
consistent we use a u8 integer (instead of u16) whenever we copy it to
local variables.

Signed-off-by: David Decotigny <decot@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 494bf960442d3ff533507661ce394d0d128a3d6f..123dd602261f2da9c0825503730b7b2129c988db 100644 (file)
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -716,11 +716,9 @@ static void __set_agg_ports_ready(struct aggregator *aggregator, int val)
 static u32 __get_agg_bandwidth(struct aggregator *aggregator)
 {
        u32 bandwidth = 0;
-       u32 basic_speed;
 
        if (aggregator->num_of_ports) {
-               basic_speed = __get_link_speed(aggregator->lag_ports);
-               switch (basic_speed) {
+               switch (__get_link_speed(aggregator->lag_ports)) {
                case AD_LINK_SPEED_BITMASK_1MBPS:
                        bandwidth = aggregator->num_of_ports;
                        break;

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 94a371c12d707ba2b497c8aab35f5082815d1748..4df674bc6f125973169fd493151304739e04aebd 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3340,7 +3340,7 @@ static int bond_slave_netdev_event(unsigned long event,
                        slave = bond_get_slave_by_dev(bond, slave_dev);
                        if (slave) {
                                u16 old_speed = slave->speed;
-                               u16 old_duplex = slave->duplex;
+                               u8  old_duplex = slave->duplex;
 
                                bond_update_speed_duplex(slave);