From: Pavel Emelyanov <xemul@openvz.org>
To: Jay Vosburgh <fubar@us.ibm.com>, David Miller <davem@davemloft.net>
Cc: bonding-devel@lists.sourceforge.net,
Linux Netdev List <netdev@vger.kernel.org>
Subject: [PATCH 3/8][BONDING]: Merge two calls to dev_alloc_name.
Date: Tue, 29 Apr 2008 18:58:37 +0400 [thread overview]
Message-ID: <4817379D.8040409@openvz.org> (raw)
In-Reply-To: <481735F4.30909@openvz.org>
Just reduce the amount of code after the previous patch.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
drivers/net/bonding/bond_main.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 2072910..0907f43 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4905,11 +4905,10 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond
goto out_rtnl;
}
- if (!name) {
- res = dev_alloc_name(bond_dev, "bond%d");
- if (res < 0)
- goto out_netdev;
- } else if (strchr(name, '%')) {
+ if (!name)
+ name = "bond%d";
+
+ if (strchr(name, '%')) {
res = dev_alloc_name(bond_dev, name);
if (res < 0)
goto out_netdev;
--
1.5.3.4
next prev parent reply other threads:[~2008-04-29 15:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-29 14:51 [PATCH 0/8][BONDING]: Some BUGs and deadlocks fixes and a bit of concomitant cleanups Pavel Emelyanov
2008-04-29 14:54 ` [PATCH 1/8][BONDING]: Do not call free_netdev for already registered device Pavel Emelyanov
2008-04-29 14:56 ` [PATCH 2/8][BONDING]: Don't create bondings with % in their names Pavel Emelyanov
2008-04-29 14:58 ` Pavel Emelyanov [this message]
2008-04-29 15:01 ` [PATCH 4/8][BONDING]: Remove redundant argument from bond_create Pavel Emelyanov
2008-04-29 15:02 ` [PATCH 5/8][BONDING]: Lost semaphores unlock in one of bonding_store_bonds error paths Pavel Emelyanov
2008-04-29 15:05 ` [PATCH 6/8][BONDING]: Relax unneeded _safe lists iterations Pavel Emelyanov
2008-04-29 15:06 ` [PATCH 7/8][BONDING]: Remove unneeded list_empty checks Pavel Emelyanov
2008-04-29 15:11 ` [PATCH 8/8][BONDING]: Deadlock between bonding_store_bonds and bond_destroy_sysfs Pavel Emelyanov
2008-05-03 0:06 ` [PATCH 0/8][BONDING]: Some BUGs and deadlocks fixes and a bit of concomitant cleanups David Miller
2008-05-03 0:25 ` Jay Vosburgh
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=4817379D.8040409@openvz.org \
--to=xemul@openvz.org \
--cc=bonding-devel@lists.sourceforge.net \
--cc=davem@davemloft.net \
--cc=fubar@us.ibm.com \
--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).