diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 01:00:20 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-08-28 01:00:20 -0400 |
| commit | 4b61bb575b1fb42ab1df228ae7812e5135f656da (patch) | |
| tree | 03456466e6f678456ea462a7da4b352d1aa03aa3 /include/net/sch_generic.h | |
| parent | 805423e84e900e56c834aadee61a020b0d5092c3 (diff) | |
| parent | 326ba5010a5429a5a528b268b36a5900d4ab0eba (diff) | |
Merge commit 'v2.6.31-rc8' into next
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 | |||
| 72 | */ | 72 | */ |
| 73 | unsigned long state; | 73 | unsigned long state; |
| 74 | struct sk_buff_head q; | 74 | struct sk_buff_head q; |
| 75 | struct gnet_stats_basic bstats; | 75 | struct gnet_stats_basic_packed bstats; |
| 76 | struct gnet_stats_queue qstats; | 76 | struct gnet_stats_queue qstats; |
| 77 | }; | 77 | }; |
| 78 | 78 | ||