diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
| commit | 695a461296e5df148c99ac087b9e1cb380f4db15 (patch) | |
| tree | 951893036fdc0b7bae0e17bc739ac8ffe909781d /include/net/sch_generic.h | |
| parent | c7084b35eb1a4d3353a501508baf9d3d82822c93 (diff) | |
| parent | 2b681fafcc50fea6304ed418667c9d04282acb73 (diff) | |
Merge branch 'amd-iommu/2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
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 | ||