diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-02 03:32:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-02 03:32:56 -0400 |
| commit | 6cdee2f96a97f6da26bd3759c3f8823332fbb438 (patch) | |
| tree | ec79086f05ffc3bdf1aecc37e108ccfc3a95450d /include/net/sch_generic.h | |
| parent | 0625491493d9000e4556bf566d205c28c8e7dc4e (diff) | |
| parent | 2fbd3da3877ad8d923b055e5996f80b4d4a6daf4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/yellowfin.c
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 84b3fc2aef0f..a48a4cc7258b 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h | |||
| @@ -73,7 +73,7 @@ struct Qdisc | |||
| 73 | */ | 73 | */ |
| 74 | unsigned long state; | 74 | unsigned long state; |
| 75 | struct sk_buff_head q; | 75 | struct sk_buff_head q; |
| 76 | struct gnet_stats_basic bstats; | 76 | struct gnet_stats_basic_packed bstats; |
| 77 | struct gnet_stats_queue qstats; | 77 | struct gnet_stats_queue qstats; |
| 78 | }; | 78 | }; |
| 79 | 79 | ||