From: Stephen Hemminger <shemminger@vyatta.com>
To: Jay Vosburg <fubar@us.ibm.com>, "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org, bonding-devel@lists.sourceforge.net
Subject: [PATCH 1/9] bonding: bond_create always called with default parameters
Date: Fri, 12 Jun 2009 22:02:44 -0700 [thread overview]
Message-ID: <20090613050421.520406512@vyatta.com> (raw)
In-Reply-To: 20090613050243.100086546@vyatta.com
[-- Attachment #1: bond-default-params.patch --]
[-- Type: text/plain, Size: 3529 bytes --]
bond_create() is always called with same parameters so move the argument
down.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/bonding/bond_main.c 2009-06-12 07:10:29.629556854 -0700
+++ b/drivers/net/bonding/bond_main.c 2009-06-12 11:14:15.847243005 -0700
@@ -101,7 +101,7 @@ static int arp_interval = BOND_LINK_ARP_
static char *arp_ip_target[BOND_MAX_ARP_TARGETS] = { NULL, };
static char *arp_validate = NULL;
static char *fail_over_mac = NULL;
-struct bond_params bonding_defaults;
+static struct bond_params bonding_defaults;
module_param(max_bonds, int, 0);
MODULE_PARM_DESC(max_bonds, "Max number of bonded devices");
@@ -4592,7 +4592,7 @@ static const struct net_device_ops bond_
* Does not allocate but creates a /proc entry.
* Allowed to fail.
*/
-static int bond_init(struct net_device *bond_dev, struct bond_params *params)
+static int bond_init(struct net_device *bond_dev)
{
struct bonding *bond = netdev_priv(bond_dev);
@@ -4602,7 +4602,7 @@ static int bond_init(struct net_device *
rwlock_init(&bond->lock);
rwlock_init(&bond->curr_slave_lock);
- bond->params = *params; /* copy params struct */
+ bond->params = bonding_defaults;
bond->wq = create_singlethread_workqueue(bond_dev->name);
if (!bond->wq)
@@ -5116,7 +5116,7 @@ static void bond_set_lockdep_class(struc
* Caller must NOT hold rtnl_lock; we need to release it here before we
* set up our sysfs entries.
*/
-int bond_create(char *name, struct bond_params *params)
+int bond_create(const char *name)
{
struct net_device *bond_dev;
struct bonding *bond;
@@ -5159,7 +5159,7 @@ int bond_create(char *name, struct bond_
* need to set function pointers.
*/
- res = bond_init(bond_dev, params);
+ res = bond_init(bond_dev);
if (res < 0) {
goto out_netdev;
}
@@ -5212,7 +5212,7 @@ static int __init bonding_init(void)
init_rwsem(&bonding_rwsem);
for (i = 0; i < max_bonds; i++) {
- res = bond_create(NULL, &bonding_defaults);
+ res = bond_create(NULL);
if (res)
goto err;
}
--- a/drivers/net/bonding/bond_sysfs.c 2009-06-12 07:10:29.655894986 -0700
+++ b/drivers/net/bonding/bond_sysfs.c 2009-06-12 11:12:49.939186681 -0700
@@ -112,7 +112,7 @@ static ssize_t bonding_store_bonds(struc
if (command[0] == '+') {
printk(KERN_INFO DRV_NAME
": %s is being created...\n", ifname);
- rv = bond_create(ifname, &bonding_defaults);
+ rv = bond_create(ifname);
if (rv) {
printk(KERN_INFO DRV_NAME ": Bond creation failed.\n");
res = rv;
--- a/drivers/net/bonding/bonding.h 2009-06-12 07:10:29.645594813 -0700
+++ b/drivers/net/bonding/bonding.h 2009-06-12 11:12:49.927192098 -0700
@@ -321,7 +321,7 @@ static inline void bond_unset_master_alb
struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr);
int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev);
-int bond_create(char *name, struct bond_params *params);
+int bond_create(const char *name);
void bond_destroy(struct bonding *bond);
int bond_release_and_destroy(struct net_device *bond_dev, struct net_device *slave_dev);
int bond_create_sysfs(void);
@@ -349,7 +349,6 @@ extern const struct bond_parm_tbl bond_m
extern const struct bond_parm_tbl xmit_hashtype_tbl[];
extern const struct bond_parm_tbl arp_validate_tbl[];
extern const struct bond_parm_tbl fail_over_mac_tbl[];
-extern struct bond_params bonding_defaults;
extern struct bond_parm_tbl ad_select_tbl[];
/* exported from bond_sysfs.c */
--
next prev parent reply other threads:[~2009-06-13 5:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-13 5:02 [PATCH 0/9] Bonding patches for 2.6.31 Stephen Hemminger
2009-06-13 5:02 ` Stephen Hemminger [this message]
2009-06-13 5:02 ` [PATCH 2/9] bonding: initialize before registration Stephen Hemminger
2009-06-13 5:02 ` [PATCH 3/9] Subjec: bonding: remove bonding read/write semaphore Stephen Hemminger
2009-06-13 5:02 ` [PATCH 4/9] bonding: fix destructor Stephen Hemminger
2009-06-13 5:02 ` [PATCH 5/9] bonding: fix style issues Stephen Hemminger
2009-06-13 5:02 ` [PATCH 6/9] bonding: elminate bad refcount code Stephen Hemminger
2009-06-13 5:02 ` [PATCH 7/9] bonding: network device names are case sensative Stephen Hemminger
2009-06-13 5:02 ` [PATCH 8/9] bonding: use is_zero_ether_addr Stephen Hemminger
2009-06-13 5:02 ` [PATCH 9/9] bonding: initialization rework Stephen Hemminger
2009-06-14 6:37 ` [PATCH 0/9] Bonding patches for 2.6.31 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=20090613050421.520406512@vyatta.com \
--to=shemminger@vyatta.com \
--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).