bonding/bond_main.c: make 2 functions static

[linux-2.6-omap-h63xx.git] / drivers / net / bonding / bond_main.c

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index cea3783c92c55febc5f713731c07fb510f631e92..cb9cb3013f4250d7fbf302b4495fa069abd47efa 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -187,7 +187,7 @@ static void bond_send_gratuitous_arp(struct bonding *bond);
 
 /*---------------------------- General routines -----------------------------*/
 
-const char *bond_mode_name(int mode)
+static const char *bond_mode_name(int mode)
 {
        switch (mode) {
        case BOND_MODE_ROUNDROBIN :
@@ -1224,7 +1224,8 @@ static void bond_detach_slave(struct bonding *bond, struct slave *slave)
 
 /*---------------------------------- IOCTL ----------------------------------*/
 
-int bond_sethwaddr(struct net_device *bond_dev, struct net_device *slave_dev)
+static 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);
@@ -1360,13 +1361,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                goto err_undo_flags;
        }
 
-       if (slave_dev->get_stats == NULL) {
-               printk(KERN_NOTICE DRV_NAME
-                       ": %s: the driver for slave device %s does not provide "
-                       "get_stats function, network statistics will be "
-                       "inaccurate.\n", bond_dev->name, slave_dev->name);
-       }
-
        new_slave = kzalloc(sizeof(struct slave), GFP_KERNEL);
        if (!new_slave) {
                res = -ENOMEM;
@@ -1397,6 +1391,11 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                goto err_free;
        }
 
+       res = netdev_set_master(slave_dev, bond_dev);
+       if (res) {
+               dprintk("Error %d calling netdev_set_master\n", res);
+               goto err_close;
+       }
        /* open the slave since the application closed it */
        res = dev_open(slave_dev);
        if (res) {
@@ -1404,12 +1403,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
                goto err_restore_mac;
        }
 
-       res = netdev_set_master(slave_dev, bond_dev);
-       if (res) {
-               dprintk("Error %d calling netdev_set_master\n", res);
-               goto err_close;
-       }
-
        new_slave->dev = slave_dev;
        slave_dev->priv_flags |= IFF_BONDING;
 
@@ -3468,7 +3461,7 @@ void bond_unregister_arp(struct bonding *bond)
 /*---------------------------- Hashing Policies -----------------------------*/
 
 /*
- * Hash for the the output device based upon layer 3 and layer 4 data. If
+ * Hash for the output device based upon layer 3 and layer 4 data. If
  * the packet is a frag or not TCP or UDP, just use layer 3 data.  If it is
  * altogether not IP, mimic bond_xmit_hash_policy_l2()
  */
@@ -3641,33 +3634,31 @@ static struct net_device_stats *bond_get_stats(struct net_device *bond_dev)
 
        bond_for_each_slave(bond, slave, i) {
                sstats = slave->dev->get_stats(slave->dev);
-               if (sstats) {
-                       stats->rx_packets += sstats->rx_packets;
-                       stats->rx_bytes += sstats->rx_bytes;
-                       stats->rx_errors += sstats->rx_errors;
-                       stats->rx_dropped += sstats->rx_dropped;
-
-                       stats->tx_packets += sstats->tx_packets;
-                       stats->tx_bytes += sstats->tx_bytes;
-                       stats->tx_errors += sstats->tx_errors;
-                       stats->tx_dropped += sstats->tx_dropped;
-
-                       stats->multicast += sstats->multicast;
-                       stats->collisions += sstats->collisions;
-
-                       stats->rx_length_errors += sstats->rx_length_errors;
-                       stats->rx_over_errors += sstats->rx_over_errors;
-                       stats->rx_crc_errors += sstats->rx_crc_errors;
-                       stats->rx_frame_errors += sstats->rx_frame_errors;
-                       stats->rx_fifo_errors += sstats->rx_fifo_errors;
-                       stats->rx_missed_errors += sstats->rx_missed_errors;
-
-                       stats->tx_aborted_errors += sstats->tx_aborted_errors;
-                       stats->tx_carrier_errors += sstats->tx_carrier_errors;
-                       stats->tx_fifo_errors += sstats->tx_fifo_errors;
-                       stats->tx_heartbeat_errors += sstats->tx_heartbeat_errors;
-                       stats->tx_window_errors += sstats->tx_window_errors;
-               }
+               stats->rx_packets += sstats->rx_packets;
+               stats->rx_bytes += sstats->rx_bytes;
+               stats->rx_errors += sstats->rx_errors;
+               stats->rx_dropped += sstats->rx_dropped;
+
+               stats->tx_packets += sstats->tx_packets;
+               stats->tx_bytes += sstats->tx_bytes;
+               stats->tx_errors += sstats->tx_errors;
+               stats->tx_dropped += sstats->tx_dropped;
+
+               stats->multicast += sstats->multicast;
+               stats->collisions += sstats->collisions;
+
+               stats->rx_length_errors += sstats->rx_length_errors;
+               stats->rx_over_errors += sstats->rx_over_errors;
+               stats->rx_crc_errors += sstats->rx_crc_errors;
+               stats->rx_frame_errors += sstats->rx_frame_errors;
+               stats->rx_fifo_errors += sstats->rx_fifo_errors;
+               stats->rx_missed_errors += sstats->rx_missed_errors;
+
+               stats->tx_aborted_errors += sstats->tx_aborted_errors;
+               stats->tx_carrier_errors += sstats->tx_carrier_errors;
+               stats->tx_fifo_errors += sstats->tx_fifo_errors;
+               stats->tx_heartbeat_errors += sstats->tx_heartbeat_errors;
+               stats->tx_window_errors += sstats->tx_window_errors;
        }
 
        read_unlock_bh(&bond->lock);
@@ -4354,8 +4345,8 @@ static void bond_free_all(void)
                bond_mc_list_destroy(bond);
                /* Release the bonded slaves */
                bond_release_all(bond_dev);
-               unregister_netdevice(bond_dev);
                bond_deinit(bond_dev);
+               unregister_netdevice(bond_dev);
        }
 
 #ifdef CONFIG_PROC_FS