From: Wangyufen <wangyufen@huawei.com>
To: <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>
Subject: [PATCH 5/6] bonding:fix checkpatch warnings braces {}
Date: Fri, 14 Feb 2014 17:15:16 +0800 [thread overview]
Message-ID: <1392369317-8072-6-git-send-email-wangyufen@huawei.com> (raw)
In-Reply-To: <1392369317-8072-1-git-send-email-wangyufen@huawei.com>
From: Wang Yufen <wangyufen@huawei.com>
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
---
drivers/net/bonding/bond_alb.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index cde39f0..e7a4600 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -1343,9 +1343,8 @@ void bond_alb_deinitialize(struct bonding *bond)
tlb_deinitialize(bond);
- if (bond_info->rlb_enabled) {
+ if (bond_info->rlb_enabled)
rlb_deinitialize(bond);
- }
}
int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
@@ -1429,9 +1428,8 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
break;
case ETH_P_ARP:
do_tx_balance = 0;
- if (bond_info->rlb_enabled) {
+ if (bond_info->rlb_enabled)
tx_slave = rlb_arp_xmit(skb, bond);
- }
break;
default:
do_tx_balance = 0;
@@ -1565,11 +1563,10 @@ void bond_alb_monitor(struct work_struct *work)
--bond_info->rlb_update_delay_counter;
} else {
rlb_update_rx_clients(bond);
- if (bond_info->rlb_update_retry_counter) {
+ if (bond_info->rlb_update_retry_counter)
--bond_info->rlb_update_retry_counter;
- } else {
+ else
bond_info->rx_ntt = 0;
- }
}
}
}
@@ -1586,23 +1583,20 @@ int bond_alb_init_slave(struct bonding *bond, struct slave *slave)
int res;
res = alb_set_slave_mac_addr(slave, slave->perm_hwaddr);
- if (res) {
+ if (res)
return res;
- }
res = alb_handle_addr_collision_on_attach(bond, slave);
- if (res) {
+ if (res)
return res;
- }
tlb_init_slave(slave);
/* order a rebalance ASAP */
bond->alb_info.tx_rebalance_counter = BOND_TLB_REBALANCE_TICKS;
- if (bond->alb_info.rlb_enabled) {
+ if (bond->alb_info.rlb_enabled)
bond->alb_info.rlb_rebalance = 1;
- }
return 0;
}
--
1.7.12
next prev parent reply other threads:[~2014-02-14 9:15 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-14 9:15 [PATCH 0/6] bonding:fix checkpatch errors or warning Wangyufen
2014-02-14 9:15 ` [PATCH 1/6] bonding:fix checkpatch errors with foo* bar|foo * bar Wangyufen
2014-02-14 9:15 ` [PATCH 2/6] bonding:fix checkpatch errors comments and space Wangyufen
2014-02-14 9:15 ` [PATCH 3/6] bonding:fix checkpatch warnings braces {} Wangyufen
2014-02-14 9:15 ` [PATCH 4/6] " Wangyufen
2014-02-14 22:37 ` Sergei Shtylyov
2014-02-14 9:15 ` Wangyufen [this message]
2014-02-14 22:39 ` [PATCH 5/6] " Sergei Shtylyov
2014-02-14 9:15 ` [PATCH 6/6] " Wangyufen
2014-02-14 22:40 ` Sergei Shtylyov
2014-02-14 21:22 ` [PATCH 0/6] bonding:fix checkpatch errors or warning David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1392369317-8072-6-git-send-email-wangyufen@huawei.com \
--to=wangyufen@huawei.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).