diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 06:22:54 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-01-19 06:22:54 -0500 |
| commit | a1926d1745114789687ac029ae8c58944b7d2256 (patch) | |
| tree | c303e75615e378451a80b97bfd2c1ba54029d9bb /include/net/red.h | |
| parent | 492e917635a0fa05439bb562fd51577efc9cef30 (diff) | |
| parent | 52fc43f7c1c416b114e88ff39635c36e67ef15b6 (diff) | |
Merge branch 'for-2.6.38' into for-2.6.39
Diffstat (limited to 'include/net/red.h')
| -rw-r--r-- | include/net/red.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/red.h b/include/net/red.h index 995108e54d9f..3319f16b3beb 100644 --- a/include/net/red.h +++ b/include/net/red.h | |||
| @@ -97,7 +97,6 @@ struct red_stats { | |||
| 97 | u32 forced_mark; /* Forced marks, qavg > max_thresh */ | 97 | u32 forced_mark; /* Forced marks, qavg > max_thresh */ |
| 98 | u32 pdrop; /* Drops due to queue limits */ | 98 | u32 pdrop; /* Drops due to queue limits */ |
| 99 | u32 other; /* Drops due to drop() calls */ | 99 | u32 other; /* Drops due to drop() calls */ |
| 100 | u32 backlog; | ||
| 101 | }; | 100 | }; |
| 102 | 101 | ||
| 103 | struct red_parms { | 102 | struct red_parms { |