diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-04 09:28:52 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-04 09:29:05 +0200 |
| commit | 29e2035bddecce3eb584a8304528b50da8370a24 (patch) | |
| tree | 13155df7d90a8e287b83a1cd6c0d02c3018212ab /include/net/sch_generic.h | |
| parent | rcu: Changes from reviews: avoid casts, fix/add warnings, improve comments (diff) | |
| parent | autofs4 - fix missed case when changing to use struct path (diff) | |
| download | linux-29e2035bddecce3eb584a8304528b50da8370a24.tar.xz linux-29e2035bddecce3eb584a8304528b50da8370a24.zip | |
Merge branch 'linus' into core/rcu
Merge reason: Avoid fuzz in init/main.c and update from rc6 to rc8.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/net/sch_generic.h')
| -rw-r--r-- | include/net/sch_generic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 964ffa0d8815..5482e9582f55 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -72,7 +72,7 @@ struct Qdisc */ unsigned long state; struct sk_buff_head q; - struct gnet_stats_basic bstats; + struct gnet_stats_basic_packed bstats; struct gnet_stats_queue qstats; }; |