diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-01-20 00:06:15 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-20 00:06:15 -0800 |
| commit | a07aa004c8d814a975b1a68afdb7baaa8f1b91d5 (patch) | |
| tree | 652edc2dce9732a64780b9e332034b6567631a8b /include/linux/netfilter_bridge/ebt_limit.h | |
| parent | net_sched: cleanups (diff) | |
| parent | netfilter: xtables: remove extraneous header that slipped in (diff) | |
| download | linux-dev-a07aa004c8d814a975b1a68afdb7baaa8f1b91d5.tar.xz linux-dev-a07aa004c8d814a975b1a68afdb7baaa8f1b91d5.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'include/linux/netfilter_bridge/ebt_limit.h')
| -rw-r--r-- | include/linux/netfilter_bridge/ebt_limit.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/netfilter_bridge/ebt_limit.h b/include/linux/netfilter_bridge/ebt_limit.h index 4bf76b751676..721d51ffa513 100644 --- a/include/linux/netfilter_bridge/ebt_limit.h +++ b/include/linux/netfilter_bridge/ebt_limit.h @@ -10,13 +10,13 @@ seconds, or one every 59 hours. */ struct ebt_limit_info { - u_int32_t avg; /* Average secs between packets * scale */ - u_int32_t burst; /* Period multiplier for upper limit. */ + __u32 avg; /* Average secs between packets * scale */ + __u32 burst; /* Period multiplier for upper limit. */ /* Used internally by the kernel */ unsigned long prev; - u_int32_t credit; - u_int32_t credit_cap, cost; + __u32 credit; + __u32 credit_cap, cost; }; #endif |