Skip to content

Commit

Permalink
[NET_SCHED]: sch_ingress: remove qdisc_priv() wrapper
Browse files Browse the repository at this point in the history
Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Jan 28, 2008
1 parent a478122 commit cb53c04
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions net/sched/sch_ingress.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
#include <net/pkt_sched.h>


#define PRIV(sch) qdisc_priv(sch)

/* Thanks to Doron Oz for this hack */
#ifndef CONFIG_NET_CLS_ACT
#ifdef CONFIG_NETFILTER
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;

Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit cb53c04

Please sign in to comment.