diff options
author | Patrick McHardy <kaber@trash.net> | 2008-01-21 03:12:53 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:08:20 -0500 |
commit | c6ee877f2e4c4d44c934528b4cec6c8d7f54d3ad (patch) | |
tree | 54c8e1ee3bb263cb9776deeb1ae1ce9b2c699d8e | |
parent | e037834758af82a24c4d390b93e1ce5e280a551a (diff) |
[NET_SCHED]: sch_ingress: remove unnecessary ops
- ->reset is optional
- sch_api provides identical defaults for ->dequeue/->requeue
- ->drop can't happen since ingress never has a parent qdisc
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>
-rw-r--r-- | net/sched/sch_ingress.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c index 1bbc648f06ee..c69e7bc7fb6c 100644 --- a/net/sched/sch_ingress.c +++ b/net/sched/sch_ingress.c | |||
@@ -118,21 +118,6 @@ static int ingress_enqueue(struct sk_buff *skb, struct Qdisc *sch) | |||
118 | return result; | 118 | return result; |
119 | } | 119 | } |
120 | 120 | ||
121 | static struct sk_buff *ingress_dequeue(struct Qdisc *sch) | ||
122 | { | ||
123 | return NULL; | ||
124 | } | ||
125 | |||
126 | static int ingress_requeue(struct sk_buff *skb, struct Qdisc *sch) | ||
127 | { | ||
128 | return 0; | ||
129 | } | ||
130 | |||
131 | static unsigned int ingress_drop(struct Qdisc *sch) | ||
132 | { | ||
133 | return 0; | ||
134 | } | ||
135 | |||
136 | #ifndef CONFIG_NET_CLS_ACT | 121 | #ifndef CONFIG_NET_CLS_ACT |
137 | #ifdef CONFIG_NETFILTER | 122 | #ifdef CONFIG_NETFILTER |
138 | static unsigned int ing_hook(unsigned int hook, struct sk_buff *skb, | 123 | static unsigned int ing_hook(unsigned int hook, struct sk_buff *skb, |
@@ -202,11 +187,6 @@ static int ingress_init(struct Qdisc *sch, struct rtattr *opt) | |||
202 | return 0; | 187 | return 0; |
203 | } | 188 | } |
204 | 189 | ||
205 | static void ingress_reset(struct Qdisc *sch) | ||
206 | { | ||
207 | return; | ||
208 | } | ||
209 | |||
210 | /* ------------------------------------------------------------- */ | 190 | /* ------------------------------------------------------------- */ |
211 | 191 | ||
212 | static void ingress_destroy(struct Qdisc *sch) | 192 | static void ingress_destroy(struct Qdisc *sch) |
@@ -248,11 +228,7 @@ static struct Qdisc_ops ingress_qdisc_ops __read_mostly = { | |||
248 | .id = "ingress", | 228 | .id = "ingress", |
249 | .priv_size = sizeof(struct ingress_qdisc_data), | 229 | .priv_size = sizeof(struct ingress_qdisc_data), |
250 | .enqueue = ingress_enqueue, | 230 | .enqueue = ingress_enqueue, |
251 | .dequeue = ingress_dequeue, | ||
252 | .requeue = ingress_requeue, | ||
253 | .drop = ingress_drop, | ||
254 | .init = ingress_init, | 231 | .init = ingress_init, |
255 | .reset = ingress_reset, | ||
256 | .destroy = ingress_destroy, | 232 | .destroy = ingress_destroy, |
257 | .dump = ingress_dump, | 233 | .dump = ingress_dump, |
258 | .owner = THIS_MODULE, | 234 | .owner = THIS_MODULE, |