* [2.6 patch] make bonding/bond_main.c:bond_deinit() static
@ 2007-10-24 16:23 Adrian Bunk
2007-10-25 7:31 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2007-10-24 16:23 UTC (permalink / raw)
To: Moni Shoua, Jay Vosburgh, Jeff Garzik, ctindel
Cc: bonding-devel, linux-kernel, netdev
bond_deinit() can now become static.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---
drivers/net/bonding/bond_main.c | 3 ++-
drivers/net/bonding/bonding.h | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
5e5d2537b927f55a2199a0d9a073f41bb71290f6
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 6f85cc3..8bb0092 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -188,6 +188,7 @@ struct bond_parm_tbl arp_validate_tbl[] = {
/*-------------------------- Forward declarations ---------------------------*/
static void bond_send_gratuitous_arp(struct bonding *bond);
+static void bond_deinit(struct net_device *bond_dev);
/*---------------------------- General routines -----------------------------*/
@@ -4404,7 +4405,7 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params)
/* De-initialize device specific data.
* Caller must hold rtnl_lock.
*/
-void bond_deinit(struct net_device *bond_dev)
+static void bond_deinit(struct net_device *bond_dev)
{
struct bonding *bond = bond_dev->priv;
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index b818060..aceaabb 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -298,7 +298,6 @@ int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_de
int bond_create(char *name, struct bond_params *params, struct bonding **newbond);
void bond_destroy(struct bonding *bond);
int bond_release_and_destroy(struct net_device *bond_dev, struct net_device *slave_dev);
-void bond_deinit(struct net_device *bond_dev);
int bond_create_sysfs(void);
void bond_destroy_sysfs(void);
void bond_destroy_sysfs_entry(struct bonding *bond);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [2.6 patch] make bonding/bond_main.c:bond_deinit() static
2007-10-24 16:23 [2.6 patch] make bonding/bond_main.c:bond_deinit() static Adrian Bunk
@ 2007-10-25 7:31 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2007-10-25 7:31 UTC (permalink / raw)
To: Adrian Bunk
Cc: Moni Shoua, Jay Vosburgh, ctindel, bonding-devel, linux-kernel,
netdev
applied both bonding patches
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-10-25 7:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-24 16:23 [2.6 patch] make bonding/bond_main.c:bond_deinit() static Adrian Bunk
2007-10-25 7:31 ` Jeff Garzik
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).