UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
David Decotigny 2011-04-13 15:22:30 +00:00 committed by David S. Miller
parent d30ee670f2
commit 65cce19c07
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/bonding/bond_3ad.c
View File

@ -716,11 +716,9 @@ static void __set_agg_ports_ready(struct aggregator *aggregator, int val)
static u32 __get_agg_bandwidth(struct aggregator *aggregator) static u32 __get_agg_bandwidth(struct aggregator *aggregator)
{ {
u32 bandwidth = 0; u32 bandwidth = 0;
u32 basic_speed;
if (aggregator->num_of_ports) { if (aggregator->num_of_ports) {
basic_speed = __get_link_speed(aggregator->lag_ports); switch (__get_link_speed(aggregator->lag_ports)) {
switch (basic_speed) {
case AD_LINK_SPEED_BITMASK_1MBPS: case AD_LINK_SPEED_BITMASK_1MBPS:
bandwidth = aggregator->num_of_ports; bandwidth = aggregator->num_of_ports;
break; break;

2
drivers/net/bonding/bond_main.c
View File

@ -3340,7 +3340,7 @@ static int bond_slave_netdev_event(unsigned long event,
slave = bond_get_slave_by_dev(bond, slave_dev); slave = bond_get_slave_by_dev(bond, slave_dev);
if (slave) { if (slave) {
u16 old_speed = slave->speed; u16 old_speed = slave->speed;
u16 old_duplex = slave->duplex; u8 old_duplex = slave->duplex;
bond_update_speed_duplex(slave); bond_update_speed_duplex(slave);