diff options
Diffstat (limited to 'net/sched/act_police.c')
-rw-r--r-- | net/sched/act_police.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/sched/act_police.c b/net/sched/act_police.c index af68e1e83251..6ffe35da22b1 100644 --- a/net/sched/act_police.c +++ b/net/sched/act_police.c | |||
@@ -62,7 +62,7 @@ struct tc_police_compat | |||
62 | 62 | ||
63 | #ifdef CONFIG_NET_CLS_ACT | 63 | #ifdef CONFIG_NET_CLS_ACT |
64 | static int tcf_act_police_walker(struct sk_buff *skb, struct netlink_callback *cb, | 64 | static int tcf_act_police_walker(struct sk_buff *skb, struct netlink_callback *cb, |
65 | int type, struct tc_action *a) | 65 | int type, struct tc_action *a) |
66 | { | 66 | { |
67 | struct tcf_common *p; | 67 | struct tcf_common *p; |
68 | int err = 0, index = -1, i = 0, s_i = 0, n_i = 0; | 68 | int err = 0, index = -1, i = 0, s_i = 0, n_i = 0; |
@@ -112,7 +112,7 @@ void tcf_police_destroy(struct tcf_police *p) | |||
112 | { | 112 | { |
113 | unsigned int h = tcf_hash(p->tcf_index, POL_TAB_MASK); | 113 | unsigned int h = tcf_hash(p->tcf_index, POL_TAB_MASK); |
114 | struct tcf_common **p1p; | 114 | struct tcf_common **p1p; |
115 | 115 | ||
116 | for (p1p = &tcf_police_ht[h]; *p1p; p1p = &(*p1p)->tcfc_next) { | 116 | for (p1p = &tcf_police_ht[h]; *p1p; p1p = &(*p1p)->tcfc_next) { |
117 | if (*p1p == &p->common) { | 117 | if (*p1p == &p->common) { |
118 | write_lock_bh(&police_lock); | 118 | write_lock_bh(&police_lock); |
@@ -135,7 +135,7 @@ void tcf_police_destroy(struct tcf_police *p) | |||
135 | 135 | ||
136 | #ifdef CONFIG_NET_CLS_ACT | 136 | #ifdef CONFIG_NET_CLS_ACT |
137 | static int tcf_act_police_locate(struct rtattr *rta, struct rtattr *est, | 137 | static int tcf_act_police_locate(struct rtattr *rta, struct rtattr *est, |
138 | struct tc_action *a, int ovr, int bind) | 138 | struct tc_action *a, int ovr, int bind) |
139 | { | 139 | { |
140 | unsigned h; | 140 | unsigned h; |
141 | int ret = 0, err; | 141 | int ret = 0, err; |
@@ -269,7 +269,7 @@ static int tcf_act_police_cleanup(struct tc_action *a, int bind) | |||
269 | } | 269 | } |
270 | 270 | ||
271 | static int tcf_act_police(struct sk_buff *skb, struct tc_action *a, | 271 | static int tcf_act_police(struct sk_buff *skb, struct tc_action *a, |
272 | struct tcf_result *res) | 272 | struct tcf_result *res) |
273 | { | 273 | { |
274 | struct tcf_police *police = a->priv; | 274 | struct tcf_police *police = a->priv; |
275 | psched_time_t now; | 275 | psched_time_t now; |
@@ -606,12 +606,12 @@ rtattr_failure: | |||
606 | int tcf_police_dump_stats(struct sk_buff *skb, struct tcf_police *police) | 606 | int tcf_police_dump_stats(struct sk_buff *skb, struct tcf_police *police) |
607 | { | 607 | { |
608 | struct gnet_dump d; | 608 | struct gnet_dump d; |
609 | 609 | ||
610 | if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS, | 610 | if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS, |
611 | TCA_XSTATS, police->tcf_stats_lock, | 611 | TCA_XSTATS, police->tcf_stats_lock, |
612 | &d) < 0) | 612 | &d) < 0) |
613 | goto errout; | 613 | goto errout; |
614 | 614 | ||
615 | if (gnet_stats_copy_basic(&d, &police->tcf_bstats) < 0 || | 615 | if (gnet_stats_copy_basic(&d, &police->tcf_bstats) < 0 || |
616 | #ifdef CONFIG_NET_ESTIMATOR | 616 | #ifdef CONFIG_NET_ESTIMATOR |
617 | gnet_stats_copy_rate_est(&d, &police->tcf_rate_est) < 0 || | 617 | gnet_stats_copy_rate_est(&d, &police->tcf_rate_est) < 0 || |