diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 | 
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 | 
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /include/linux/gen_stats.h | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'include/linux/gen_stats.h')
| -rw-r--r-- | include/linux/gen_stats.h | 15 | 
1 files changed, 5 insertions, 10 deletions
| diff --git a/include/linux/gen_stats.h b/include/linux/gen_stats.h index 710e901085d0..552c8a0a12d1 100644 --- a/include/linux/gen_stats.h +++ b/include/linux/gen_stats.h | |||
| @@ -18,13 +18,11 @@ enum { | |||
| 18 | * @bytes: number of seen bytes | 18 | * @bytes: number of seen bytes | 
| 19 | * @packets: number of seen packets | 19 | * @packets: number of seen packets | 
| 20 | */ | 20 | */ | 
| 21 | struct gnet_stats_basic | 21 | struct gnet_stats_basic { | 
| 22 | { | ||
| 23 | __u64 bytes; | 22 | __u64 bytes; | 
| 24 | __u32 packets; | 23 | __u32 packets; | 
| 25 | }; | 24 | }; | 
| 26 | struct gnet_stats_basic_packed | 25 | struct gnet_stats_basic_packed { | 
| 27 | { | ||
| 28 | __u64 bytes; | 26 | __u64 bytes; | 
| 29 | __u32 packets; | 27 | __u32 packets; | 
| 30 | } __attribute__ ((packed)); | 28 | } __attribute__ ((packed)); | 
| @@ -34,8 +32,7 @@ struct gnet_stats_basic_packed | |||
| 34 | * @bps: current byte rate | 32 | * @bps: current byte rate | 
| 35 | * @pps: current packet rate | 33 | * @pps: current packet rate | 
| 36 | */ | 34 | */ | 
| 37 | struct gnet_stats_rate_est | 35 | struct gnet_stats_rate_est { | 
| 38 | { | ||
| 39 | __u32 bps; | 36 | __u32 bps; | 
| 40 | __u32 pps; | 37 | __u32 pps; | 
| 41 | }; | 38 | }; | 
| @@ -48,8 +45,7 @@ struct gnet_stats_rate_est | |||
| 48 | * @requeues: number of requeues | 45 | * @requeues: number of requeues | 
| 49 | * @overlimits: number of enqueues over the limit | 46 | * @overlimits: number of enqueues over the limit | 
| 50 | */ | 47 | */ | 
| 51 | struct gnet_stats_queue | 48 | struct gnet_stats_queue { | 
| 52 | { | ||
| 53 | __u32 qlen; | 49 | __u32 qlen; | 
| 54 | __u32 backlog; | 50 | __u32 backlog; | 
| 55 | __u32 drops; | 51 | __u32 drops; | 
| @@ -62,8 +58,7 @@ struct gnet_stats_queue | |||
| 62 | * @interval: sampling period | 58 | * @interval: sampling period | 
| 63 | * @ewma_log: the log of measurement window weight | 59 | * @ewma_log: the log of measurement window weight | 
| 64 | */ | 60 | */ | 
| 65 | struct gnet_estimator | 61 | struct gnet_estimator { | 
| 66 | { | ||
| 67 | signed char interval; | 62 | signed char interval; | 
| 68 | unsigned char ewma_log; | 63 | unsigned char ewma_log; | 
| 69 | }; | 64 | }; | 
