[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bonding-devel
Subject:    [Bonding-devel] [PATCH 2.6.14 10/18] make functions not static
From:       Mitch Williams <mitch.a.williams () intel ! com>
Date:       2005-11-09 18:35:51
Message-ID: Pine.CYG.4.58.0511081246440.1624 () mawilli1-desk2 ! amr ! corp ! intel ! com
[Download RAW message or body]

The sysfs code needs access these functions, so make them
not static, and move the protos to the header file.

Signed-off-by:  Mitch Williams <mitch.a.williams@intel.com>


diff -urpN -X dontdiff linux-2.6.14-release/drivers/net/bonding/bonding.h \
                linux-2.6.14/drivers/net/bonding/bonding.h
--- linux-2.6.14-release/drivers/net/bonding/bonding.h	2005-11-08 11:18:32.000000000 \
                -0800
+++ linux-2.6.14/drivers/net/bonding/bonding.h	2005-11-08 11:18:42.000000000 -0800
@@ -263,6 +263,18 @@ extern inline void bond_set_slave_active

 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); +void bond_deinit(struct net_device *bond_dev);
+int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev);
+int bond_release(struct net_device *bond_dev, struct net_device *slave_dev);
+int bond_sethwaddr(struct net_device *bond_dev, struct net_device *slave_dev);
+void bond_mii_monitor(struct net_device *bond_dev);
+void bond_loadbalance_arp_mon(struct net_device *bond_dev);
+void bond_activebackup_arp_mon(struct net_device *bond_dev);
+void bond_set_mode_ops(struct bonding *bond, int mode);
+int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl);
+const char *bond_mode_name(int mode);
+void bond_select_active_slave(struct bonding *bond);
+void bond_change_active_slave(struct bonding *bond, struct slave *new_active);

 #endif /* _LINUX_BONDING_H */

diff -urpN -X dontdiff linux-2.6.14-release/drivers/net/bonding/bond_main.c \
                linux-2.6.14/drivers/net/bonding/bond_main.c
--- linux-2.6.14-release/drivers/net/bonding/bond_main.c	2005-11-08 \
                11:18:32.000000000 -0800
+++ linux-2.6.14/drivers/net/bonding/bond_main.c	2005-11-08 11:18:42.000000000 -0800
@@ -632,12 +632,11 @@ struct bond_parm_tbl xmit_hashtype_tbl[]

 /*-------------------------- Forward declarations ---------------------------*/

-static inline void bond_set_mode_ops(struct bonding *bond, int mode);
 static void bond_send_gratuitous_arp(struct bonding *bond);

 /*---------------------------- General routines -----------------------------*/

-static const char *bond_mode_name(int mode)
+const char *bond_mode_name(int mode)
 {
 	switch (mode) {
 	case BOND_MODE_ROUNDROBIN :
@@ -1453,7 +1452,7 @@ static struct slave *bond_find_best_slav
  *
  * Warning: Caller must hold curr_slave_lock for writing.
  */
-static void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
+void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
 {
 	struct slave *old_active = bond->curr_active_slave;

@@ -1527,7 +1526,7 @@ static void bond_change_active_slave(str
  *
  * Warning: Caller must hold curr_slave_lock for writing.
  */
-static void bond_select_active_slave(struct bonding *bond)
+void bond_select_active_slave(struct bonding *bond)
 {
 	struct slave *best_slave;

@@ -1595,7 +1594,7 @@ static void bond_detach_slave(struct bon

 /*---------------------------------- IOCTL ----------------------------------*/

-static int bond_sethwaddr(struct net_device *bond_dev, struct net_device *slave_dev)
+int bond_sethwaddr(struct net_device *bond_dev, struct net_device *slave_dev)
 {
 	dprintk("bond_dev=%p\n", bond_dev);
 	dprintk("slave_dev=%p\n", slave_dev);
@@ -1643,7 +1642,7 @@ static int bond_compute_features(struct
 }

 /* enslave device <slave> to bond device <master> */
-static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
+int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
 {
 	struct bonding *bond = bond_dev->priv;
 	struct slave *new_slave = NULL;
@@ -2010,7 +2009,7 @@ err_undo_flags:
  *   for Bonded connections:
  *     The first up interface should be left on and all others downed.
  */
-static int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
+int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
 {
 	struct bonding *bond = bond_dev->priv;
 	struct slave *slave, *oldcurrent;
@@ -2411,7 +2410,7 @@ static int bond_slave_info_query(struct
 /*-------------------------------- Monitoring -------------------------------*/

 /* this function is called regularly to monitor each slave's link. */
-static void bond_mii_monitor(struct net_device *bond_dev)
+void bond_mii_monitor(struct net_device *bond_dev)
 {
 	struct bonding *bond = bond_dev->priv;
 	struct slave *slave, *oldcurrent;
@@ -2842,7 +2841,7 @@ static void bond_send_gratuitous_arp(str
  * arp is transmitted to generate traffic. see activebackup_arp_monitor for
  * arp monitoring in active backup mode.
  */
-static void bond_loadbalance_arp_mon(struct net_device *bond_dev)
+void bond_loadbalance_arp_mon(struct net_device *bond_dev)
 {
 	struct bonding *bond = bond_dev->priv;
 	struct slave *slave, *oldcurrent;
@@ -2980,7 +2979,7 @@ out:
  * may have received.
  * see loadbalance_arp_monitor for arp monitoring in load balancing mode
  */
-static void bond_activebackup_arp_mon(struct net_device *bond_dev)
+void bond_activebackup_arp_mon(struct net_device *bond_dev)
 {
 	struct bonding *bond = bond_dev->priv;
 	struct slave *slave;
@@ -4403,7 +4402,7 @@ out:
 /*
  * set bond mode specific net device operations
  */
-static inline void bond_set_mode_ops(struct bonding *bond, int mode)
+void bond_set_mode_ops(struct bonding *bond, int mode)
 {
 	struct net_device *bond_dev = bond->dev;

@@ -4540,7 +4539,7 @@ static int __init bond_init(struct net_d
 /* De-initialize device specific data.
  * Caller must hold rtnl_lock.
  */
-static inline void bond_deinit(struct net_device *bond_dev)
+void bond_deinit(struct net_device *bond_dev)
 {
 	struct bonding *bond = bond_dev->priv;

@@ -4576,7 +4575,7 @@ static void bond_free_all(void)
  * Convert string input module parms.  Accept either the
  * number of the mode or its string name.
  */
-static inline int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl)
+int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl)
 {
 	int i;



-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Bonding-devel mailing list
Bonding-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bonding-devel


[prev in list] [next in list] [prev in thread] [next in thread]