Skip to content

Commit

Permalink
bonding: slight optimization for bond_3ad_xmit_xor()
Browse files Browse the repository at this point in the history
The bond_dev_queue_xmit() will always return 0, and as a fast path,
it is inappropriate to check the res value when xmit every package,
so remove the res check and avoid once judgement for xmit.

Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
dingtianhong authored and David S. Miller committed Jan 2, 2014
1 parent 815117a commit a742e1f
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions drivers/net/bonding/bond_3ad.c
Original file line number Diff line number Diff line change
Expand Up @@ -2401,21 +2401,20 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
struct list_head *iter;
int slaves_in_agg;
int slave_agg_no;
int res = 1;
int agg_id;

if (__bond_3ad_get_active_agg_info(bond, &ad_info)) {
pr_debug("%s: Error: __bond_3ad_get_active_agg_info failed\n",
dev->name);
goto out;
goto err_free;
}

slaves_in_agg = ad_info.ports;
agg_id = ad_info.aggregator_id;

if (slaves_in_agg == 0) {
pr_debug("%s: Error: active aggregator is empty\n", dev->name);
goto out;
goto err_free;
}

slave_agg_no = bond_xmit_hash(bond, skb, slaves_in_agg);
Expand All @@ -2434,29 +2433,30 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
}

if (SLAVE_IS_OK(slave)) {
res = bond_dev_queue_xmit(bond, skb, slave->dev);
bond_dev_queue_xmit(bond, skb, slave->dev);
goto out;
}
}

if (slave_agg_no >= 0) {
pr_err("%s: Error: Couldn't find a slave to tx on for aggregator ID %d\n",
dev->name, agg_id);
goto out;
goto err_free;
}

/* we couldn't find any suitable slave after the agg_no, so use the
* first suitable found, if found. */
if (first_ok_slave)
res = bond_dev_queue_xmit(bond, skb, first_ok_slave->dev);
bond_dev_queue_xmit(bond, skb, first_ok_slave->dev);
else
goto err_free;

out:
if (res) {
/* no suitable interface, frame not sent */
kfree_skb(skb);
}

return NETDEV_TX_OK;
err_free:
/* no suitable interface, frame not sent */
kfree_skb(skb);
goto out;
}

int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond,
Expand Down

0 comments on commit a742e1f

Please sign in to comment.