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

Commit 65cce19c authored by David Decotigny's avatar David Decotigny Committed by David S. Miller
Browse files

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: default avatarDavid Decotigny <decot@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d30ee670

drivers/net/bonding/bond_3ad.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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);