aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/act_api.h15
-rw-r--r--net/sched/act_police.c15
2 files changed, 15 insertions, 15 deletions
diff --git a/include/net/act_api.h b/include/net/act_api.h
index 112c25c393a2..06ef7e926a66 100644
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -35,21 +35,6 @@ struct tcf_common {
35#define tcf_lock common.tcfc_lock 35#define tcf_lock common.tcfc_lock
36#define tcf_rcu common.tcfc_rcu 36#define tcf_rcu common.tcfc_rcu
37 37
38struct tcf_police {
39 struct tcf_common common;
40 int tcfp_result;
41 u32 tcfp_ewma_rate;
42 u32 tcfp_burst;
43 u32 tcfp_mtu;
44 u32 tcfp_toks;
45 u32 tcfp_ptoks;
46 psched_time_t tcfp_t_c;
47 struct qdisc_rate_table *tcfp_R_tab;
48 struct qdisc_rate_table *tcfp_P_tab;
49};
50#define to_police(pc) \
51 container_of(pc, struct tcf_police, common)
52
53struct tcf_hashinfo { 38struct tcf_hashinfo {
54 struct tcf_common **htab; 39 struct tcf_common **htab;
55 unsigned int hmask; 40 unsigned int hmask;
diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index 8dbd695c160b..378a6494ba5a 100644
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -22,6 +22,21 @@
22#include <net/act_api.h> 22#include <net/act_api.h>
23#include <net/netlink.h> 23#include <net/netlink.h>
24 24
25struct tcf_police {
26 struct tcf_common common;
27 int tcfp_result;
28 u32 tcfp_ewma_rate;
29 u32 tcfp_burst;
30 u32 tcfp_mtu;
31 u32 tcfp_toks;
32 u32 tcfp_ptoks;
33 psched_time_t tcfp_t_c;
34 struct qdisc_rate_table *tcfp_R_tab;
35 struct qdisc_rate_table *tcfp_P_tab;
36};
37#define to_police(pc) \
38 container_of(pc, struct tcf_police, common)
39
25#define L2T(p, L) qdisc_l2t((p)->tcfp_R_tab, L) 40#define L2T(p, L) qdisc_l2t((p)->tcfp_R_tab, L)
26#define L2T_P(p, L) qdisc_l2t((p)->tcfp_P_tab, L) 41#define L2T_P(p, L) qdisc_l2t((p)->tcfp_P_tab, L)
27 42