diff options
| author | Alex Elder <elder@ieee.org> | 2009-09-10 15:33:56 -0400 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2009-09-10 15:33:56 -0400 |
| commit | a4872d5b6ad69a49975c0268828b5bb2317ea5a0 (patch) | |
| tree | f79577c2731753efb621ef62774949c1e0acdaad /include/net/act_api.h | |
| parent | 4734d401d43c6469d568caf223d37aa0fc1bf4dc (diff) | |
| parent | 74fca6a42863ffacaf7ba6f1936a9f228950f657 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/net/act_api.h')
| -rw-r--r-- | include/net/act_api.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/act_api.h b/include/net/act_api.h index 565eed8fe496..c05fd717c588 100644 --- a/include/net/act_api.h +++ b/include/net/act_api.h | |||
| @@ -16,7 +16,7 @@ struct tcf_common { | |||
| 16 | u32 tcfc_capab; | 16 | u32 tcfc_capab; |
| 17 | int tcfc_action; | 17 | int tcfc_action; |
| 18 | struct tcf_t tcfc_tm; | 18 | struct tcf_t tcfc_tm; |
| 19 | struct gnet_stats_basic tcfc_bstats; | 19 | struct gnet_stats_basic_packed tcfc_bstats; |
| 20 | struct gnet_stats_queue tcfc_qstats; | 20 | struct gnet_stats_queue tcfc_qstats; |
| 21 | struct gnet_stats_rate_est tcfc_rate_est; | 21 | struct gnet_stats_rate_est tcfc_rate_est; |
| 22 | spinlock_t tcfc_lock; | 22 | spinlock_t tcfc_lock; |