From 0e40748c7c58d261537aaacb9173d7064c204a91 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 21 Jan 2008 00:11:48 -0800 Subject: [PATCH] --- yaml --- r: 79291 b: refs/heads/master c: cb53c048912976d1d81b8f3475463788f462eebd h: refs/heads/master i: 79289: 31b6f5bfb02123339dc5b968d8f44138796857ae 79287: abcf5c8a751e1ba7b61a538afeabaa88f3d4a04a v: v3 --- [refs] | 2 +- trunk/net/sched/sch_ingress.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 67f0773a0d09..83964a46256d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a47812211bb38c6754a5a6a952ab406e711cc6e0 +refs/heads/master: cb53c048912976d1d81b8f3475463788f462eebd diff --git a/trunk/net/sched/sch_ingress.c b/trunk/net/sched/sch_ingress.c index bdda28d9ebf6..cb8ba8b1ad39 100644 --- a/trunk/net/sched/sch_ingress.c +++ b/trunk/net/sched/sch_ingress.c @@ -19,8 +19,6 @@ #include -#define PRIV(sch) qdisc_priv(sch) - /* Thanks to Doron Oz for this hack */ #ifndef CONFIG_NET_CLS_ACT #ifdef CONFIG_NETFILTER @@ -74,7 +72,7 @@ static void ingress_walk(struct Qdisc *sch, struct qdisc_walker *walker) static struct tcf_proto **ingress_find_tcf(struct Qdisc *sch, unsigned long cl) { - struct ingress_qdisc_data *p = PRIV(sch); + struct ingress_qdisc_data *p = qdisc_priv(sch); return &p->filter_list; } @@ -83,7 +81,7 @@ static struct tcf_proto **ingress_find_tcf(struct Qdisc *sch, unsigned long cl) static int ingress_enqueue(struct sk_buff *skb, struct Qdisc *sch) { - struct ingress_qdisc_data *p = PRIV(sch); + struct ingress_qdisc_data *p = qdisc_priv(sch); struct tcf_result res; int result; @@ -180,7 +178,7 @@ static struct nf_hook_ops ing_ops[] __read_mostly = { static int ingress_init(struct Qdisc *sch, struct rtattr *opt) { - struct ingress_qdisc_data *p = PRIV(sch); + struct ingress_qdisc_data *p = qdisc_priv(sch); /* Make sure either netfilter or preferably CLS_ACT is * compiled in */ @@ -217,7 +215,7 @@ static void ingress_reset(struct Qdisc *sch) static void ingress_destroy(struct Qdisc *sch) { - struct ingress_qdisc_data *p = PRIV(sch); + struct ingress_qdisc_data *p = qdisc_priv(sch); tcf_destroy_chain(p->filter_list); }