aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAjit Khaparde <ajitkhaparde@gmail.com>2010-02-01 09:06:52 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-03 23:32:27 -0500
commit35cfabdc5e9b99e732899db8f36c63a215e105bc (patch)
tree2a79cf8cce65fe0bda38313b0ed24f5a36882abe /drivers
parent235ecb1db09f481840569fd85eda62e70d03580c (diff)
bonding: Remove net_device_stats from bonding struct
There is no need to maintain stats in the bonding structure. Use the instance of net_device_stats in netdevice. Signed-off-by: Ajit Khaparde <ajitk@serverengines.com> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/bonding/bond_main.c2
-rw-r--r--drivers/net/bonding/bonding.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 6221936e957a..1787e3c86573 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3742,7 +3742,7 @@ static int bond_close(struct net_device *bond_dev)
3742static struct net_device_stats *bond_get_stats(struct net_device *bond_dev) 3742static struct net_device_stats *bond_get_stats(struct net_device *bond_dev)
3743{ 3743{
3744 struct bonding *bond = netdev_priv(bond_dev); 3744 struct bonding *bond = netdev_priv(bond_dev);
3745 struct net_device_stats *stats = &bond->stats; 3745 struct net_device_stats *stats = &bond_dev->stats;
3746 struct net_device_stats local_stats; 3746 struct net_device_stats local_stats;
3747 struct slave *slave; 3747 struct slave *slave;
3748 int i; 3748 int i;
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 558ec1352527..257a7a4dfce9 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -197,7 +197,6 @@ struct bonding {
197 s8 send_grat_arp; 197 s8 send_grat_arp;
198 s8 send_unsol_na; 198 s8 send_unsol_na;
199 s8 setup_by_slave; 199 s8 setup_by_slave;
200 struct net_device_stats stats;
201#ifdef CONFIG_PROC_FS 200#ifdef CONFIG_PROC_FS
202 struct proc_dir_entry *proc_entry; 201 struct proc_dir_entry *proc_entry;
203 char proc_file_name[IFNAMSIZ]; 202 char proc_file_name[IFNAMSIZ];