summaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_alb.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-02-18 18:42:46 +0100
committerDavid S. Miller <davem@davemloft.net>2014-02-19 21:37:51 +0100
commit157550fbbbf932970b231394b1069f50104824c5 (patch)
tree1a50e17fa375160f673d8952ed25daba6580204d /drivers/net/bonding/bond_alb.c
parentbonding: More use of ether_addr_copy (diff)
downloadlinux-157550fbbbf932970b231394b1069f50104824c5.tar.xz
linux-157550fbbbf932970b231394b1069f50104824c5.zip
bonding: Remove unnecessary else
It's unnecessary and less readable after a clause ending in a goto. Signed-off-by: Joe Perches <joe@perches.com> Reviewed-by: Ding Tianhong <dingtianhong@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_alb.c')
-rw-r--r--drivers/net/bonding/bond_alb.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 97a43a20dae8..aaeeacf767f2 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -1455,12 +1455,12 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
bond_dev_queue_xmit(bond, skb, tx_slave->dev);
goto out;
- } else {
- if (tx_slave) {
- _lock_tx_hashtbl(bond);
- __tlb_clear_slave(bond, tx_slave, 0);
- _unlock_tx_hashtbl(bond);
- }
+ }
+
+ if (tx_slave) {
+ _lock_tx_hashtbl(bond);
+ __tlb_clear_slave(bond, tx_slave, 0);
+ _unlock_tx_hashtbl(bond);
}
/* no suitable interface, frame not sent */