niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

bonding: adjust style of bond_3ad_rx_indication

Browse source 
No functional changes, adjust the style of bond_3ad_rx_indication to
prepare it for the stats changes:
 - reduce indentation by returning early on wrong length
 - remove extra new lines between switch cases
 - add marker local variable and use it to reduce line length
 - rearrange local variables in reverse xmas tree
 - separate final return

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikolay Aleksandrov 2019-01-18 14:30:20 +02:00 • committed by David S. Miller
parent 1435d99703
commit 3d021715d9
1 changed files with 41 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
drivers/net/bonding/bond_3ad.c
View file

@ -2357,57 +2357,54 @@ re_arm:
static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave,
u16 length) u16 length)
{ {
struct port *port;
int ret = RX_HANDLER_ANOTHER; int ret = RX_HANDLER_ANOTHER;
struct bond_marker *marker;
struct port *port;
if (length >= sizeof(struct lacpdu)) { if (length < sizeof(struct lacpdu))
return ret;
port = &(SLAVE_AD_INFO(slave)->port); port = &(SLAVE_AD_INFO(slave)->port);
if (!port->slave) {
net_warn_ratelimited("%s: Warning: port of slave %s is uninitialized\n",
slave->dev->name, slave->bond->dev->name);
return ret;
}
if (!port->slave) { switch (lacpdu->subtype) {
net_warn_ratelimited("%s: Warning: port of slave %s is uninitialized\n", case AD_TYPE_LACPDU:
slave->dev->name, slave->bond->dev->name); ret = RX_HANDLER_CONSUMED;
return ret; netdev_dbg(slave->bond->dev,
} "Received LACPDU on port %d slave %s\n",
port->actor_port_number, slave->dev->name);
switch (lacpdu->subtype) { /* Protect against concurrent state machines */
case AD_TYPE_LACPDU: spin_lock(&slave->bond->mode_lock);
ret = RX_HANDLER_CONSUMED; ad_rx_machine(lacpdu, port);
netdev_dbg(slave->bond->dev, spin_unlock(&slave->bond->mode_lock);
"Received LACPDU on port %d slave %s\n", break;
port->actor_port_number, case AD_TYPE_MARKER:
slave->dev->name); ret = RX_HANDLER_CONSUMED;
/* Protect against concurrent state machines */ /* No need to convert fields to Little Endian since we
spin_lock(&slave->bond->mode_lock); * don't use the marker's fields.
ad_rx_machine(lacpdu, port); */
spin_unlock(&slave->bond->mode_lock); marker = (struct bond_marker *)lacpdu;
switch (marker->tlv_type) {
case AD_MARKER_INFORMATION_SUBTYPE:
netdev_dbg(slave->bond->dev, "Received Marker Information on port %d\n",
port->actor_port_number);
ad_marker_info_received(marker, port);
break; break;
case AD_MARKER_RESPONSE_SUBTYPE:
case AD_TYPE_MARKER: netdev_dbg(slave->bond->dev, "Received Marker Response on port %d\n",
ret = RX_HANDLER_CONSUMED; port->actor_port_number);
/* No need to convert fields to Little Endian since we ad_marker_response_received(marker, port);
* don't use the marker's fields. break;
*/ default:
netdev_dbg(slave->bond->dev, "Received an unknown Marker subtype on slot %d\n",
switch (((struct bond_marker *)lacpdu)->tlv_type) { port->actor_port_number);
case AD_MARKER_INFORMATION_SUBTYPE:
netdev_dbg(slave->bond->dev, "Received Marker Information on port %d\n",
port->actor_port_number);
ad_marker_info_received((struct bond_marker *)lacpdu, port);
break;
case AD_MARKER_RESPONSE_SUBTYPE:
netdev_dbg(slave->bond->dev, "Received Marker Response on port %d\n",
port->actor_port_number);
ad_marker_response_received((struct bond_marker *)lacpdu, port);
break;
default:
netdev_dbg(slave->bond->dev, "Received an unknown Marker subtype on slot %d\n",
port->actor_port_number);
}
} }
} }
return ret; return ret;
} }