Skip to content

Commit

Permalink
bonding: remove __get_first_port()
Browse files Browse the repository at this point in the history
Currently we have only one user of it, so it's kind of useless and just
obfusicates things.

Remove it and move the logic to the only user -
bond_3ad_state_machine_handler().

CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Veaceslav Falico authored and David S. Miller committed Sep 28, 2013
1 parent 3c4c88a commit fe9323d
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions drivers/net/bonding/bond_3ad.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,19 +135,6 @@ static inline struct bonding *__get_bond_by_port(struct port *port)
return bond_get_bond_by_slave(port->slave);
}

/**
* __get_first_port - get the first port in the bond
* @bond: the bond we're looking at
*
* Return the port of the first slave in @bond, or %NULL if it can't be found.
*/
static inline struct port *__get_first_port(struct bonding *bond)
{
struct slave *first_slave = bond_first_slave(bond);

return first_slave ? &(SLAVE_AD_INFO(first_slave).port) : NULL;
}

/**
* __get_first_agg - get the first aggregator in the bond
* @bond: the bond we're looking at
Expand Down Expand Up @@ -2104,8 +2091,11 @@ void bond_3ad_state_machine_handler(struct work_struct *work)

// check if agg_select_timer timer after initialize is timed out
if (BOND_AD_INFO(bond).agg_select_timer && !(--BOND_AD_INFO(bond).agg_select_timer)) {
slave = bond_first_slave(bond);
port = slave ? &(SLAVE_AD_INFO(slave).port) : NULL;

// select the active aggregator for the bond
if ((port = __get_first_port(bond))) {
if (port) {
if (!port->slave) {
pr_warning("%s: Warning: bond's first port is uninitialized\n",
bond->dev->name);
Expand Down

0 comments on commit fe9323d

Please sign in to comment.