diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-10-03 20:41:50 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:16 -0400 |
commit | 09f75cd7bf13720738e6a196cc0107ce9a5bd5a0 (patch) | |
tree | 4c85b0b395abe7f88c87162fc22570e5de255cb1 /include | |
parent | ff8ac60948ba819b89e9c87083e8050fc2f89999 (diff) |
[NET] drivers/net: statistics cleanup #1 -- save memory and shrink code
We now have struct net_device_stats embedded in struct net_device,
and the default ->get_stats() hook does the obvious thing for us.
Run through drivers/net/* and remove the driver-local storage of
statistics, and driver-local ->get_stats() hook where applicable.
This was just the low-hanging fruit in drivers/net; plenty more drivers
remain to be updated.
[ Resolved conflicts with napi_struct changes and fix sunqe build
regression... -DaveM ]
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/if_eql.h | 1 | ||||
-rw-r--r-- | include/linux/if_shaper.h | 1 | ||||
-rw-r--r-- | include/linux/if_tun.h | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/if_eql.h b/include/linux/if_eql.h index b68752fdc5c4..79c4f268410d 100644 --- a/include/linux/if_eql.h +++ b/include/linux/if_eql.h | |||
@@ -58,7 +58,6 @@ typedef struct equalizer { | |||
58 | slave_queue_t queue; | 58 | slave_queue_t queue; |
59 | int min_slaves; | 59 | int min_slaves; |
60 | int max_slaves; | 60 | int max_slaves; |
61 | struct net_device_stats stats; | ||
62 | struct timer_list timer; | 61 | struct timer_list timer; |
63 | } equalizer_t; | 62 | } equalizer_t; |
64 | 63 | ||
diff --git a/include/linux/if_shaper.h b/include/linux/if_shaper.h index 68c896a36a34..51574743aa1b 100644 --- a/include/linux/if_shaper.h +++ b/include/linux/if_shaper.h | |||
@@ -24,7 +24,6 @@ struct shaper | |||
24 | unsigned long recovery; /* Time we can next clock a packet out on | 24 | unsigned long recovery; /* Time we can next clock a packet out on |
25 | an empty queue */ | 25 | an empty queue */ |
26 | spinlock_t lock; | 26 | spinlock_t lock; |
27 | struct net_device_stats stats; | ||
28 | struct net_device *dev; | 27 | struct net_device *dev; |
29 | int (*hard_start_xmit) (struct sk_buff *skb, | 28 | int (*hard_start_xmit) (struct sk_buff *skb, |
30 | struct net_device *dev); | 29 | struct net_device *dev); |
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h index 42eb6945b93e..33e489d5bb33 100644 --- a/include/linux/if_tun.h +++ b/include/linux/if_tun.h | |||
@@ -42,7 +42,6 @@ struct tun_struct { | |||
42 | struct sk_buff_head readq; | 42 | struct sk_buff_head readq; |
43 | 43 | ||
44 | struct net_device *dev; | 44 | struct net_device *dev; |
45 | struct net_device_stats stats; | ||
46 | 45 | ||
47 | struct fasync_struct *fasync; | 46 | struct fasync_struct *fasync; |
48 | 47 | ||