diff options
-rw-r--r-- | net/sched/sch_ingress.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c index bdda28d9ebf6..cb8ba8b1ad39 100644 --- a/net/sched/sch_ingress.c +++ b/net/sched/sch_ingress.c | |||
@@ -19,8 +19,6 @@ | |||
19 | #include <net/pkt_sched.h> | 19 | #include <net/pkt_sched.h> |
20 | 20 | ||
21 | 21 | ||
22 | #define PRIV(sch) qdisc_priv(sch) | ||
23 | |||
24 | /* Thanks to Doron Oz for this hack */ | 22 | /* Thanks to Doron Oz for this hack */ |
25 | #ifndef CONFIG_NET_CLS_ACT | 23 | #ifndef CONFIG_NET_CLS_ACT |
26 | #ifdef CONFIG_NETFILTER | 24 | #ifdef CONFIG_NETFILTER |
@@ -74,7 +72,7 @@ static void ingress_walk(struct Qdisc *sch, struct qdisc_walker *walker) | |||
74 | 72 | ||
75 | static struct tcf_proto **ingress_find_tcf(struct Qdisc *sch, unsigned long cl) | 73 | static struct tcf_proto **ingress_find_tcf(struct Qdisc *sch, unsigned long cl) |
76 | { | 74 | { |
77 | struct ingress_qdisc_data *p = PRIV(sch); | 75 | struct ingress_qdisc_data *p = qdisc_priv(sch); |
78 | 76 | ||
79 | return &p->filter_list; | 77 | return &p->filter_list; |
80 | } | 78 | } |
@@ -83,7 +81,7 @@ static struct tcf_proto **ingress_find_tcf(struct Qdisc *sch, unsigned long cl) | |||
83 | 81 | ||
84 | static int ingress_enqueue(struct sk_buff *skb, struct Qdisc *sch) | 82 | static int ingress_enqueue(struct sk_buff *skb, struct Qdisc *sch) |
85 | { | 83 | { |
86 | struct ingress_qdisc_data *p = PRIV(sch); | 84 | struct ingress_qdisc_data *p = qdisc_priv(sch); |
87 | struct tcf_result res; | 85 | struct tcf_result res; |
88 | int result; | 86 | int result; |
89 | 87 | ||
@@ -180,7 +178,7 @@ static struct nf_hook_ops ing_ops[] __read_mostly = { | |||
180 | 178 | ||
181 | static int ingress_init(struct Qdisc *sch, struct rtattr *opt) | 179 | static int ingress_init(struct Qdisc *sch, struct rtattr *opt) |
182 | { | 180 | { |
183 | struct ingress_qdisc_data *p = PRIV(sch); | 181 | struct ingress_qdisc_data *p = qdisc_priv(sch); |
184 | 182 | ||
185 | /* Make sure either netfilter or preferably CLS_ACT is | 183 | /* Make sure either netfilter or preferably CLS_ACT is |
186 | * compiled in */ | 184 | * compiled in */ |
@@ -217,7 +215,7 @@ static void ingress_reset(struct Qdisc *sch) | |||
217 | 215 | ||
218 | static void ingress_destroy(struct Qdisc *sch) | 216 | static void ingress_destroy(struct Qdisc *sch) |
219 | { | 217 | { |
220 | struct ingress_qdisc_data *p = PRIV(sch); | 218 | struct ingress_qdisc_data *p = qdisc_priv(sch); |
221 | 219 | ||
222 | tcf_destroy_chain(p->filter_list); | 220 | tcf_destroy_chain(p->filter_list); |
223 | } | 221 | } |