aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_ingress.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sched/sch_ingress.c')
-rw-r--r--net/sched/sch_ingress.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index c3242f727d41..cfe070ee6ee3 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -1,4 +1,4 @@
1/* net/sched/sch_ingress.c - Ingress qdisc 1/* net/sched/sch_ingress.c - Ingress qdisc
2 * This program is free software; you can redistribute it and/or 2 * This program is free software; you can redistribute it and/or
3 * modify it under the terms of the GNU General Public License 3 * modify it under the terms of the GNU General Public License
4 * as published by the Free Software Foundation; either version 4 * as published by the Free Software Foundation; either version
@@ -47,7 +47,7 @@
47*/ 47*/
48#ifndef CONFIG_NET_CLS_ACT 48#ifndef CONFIG_NET_CLS_ACT
49#ifdef CONFIG_NETFILTER 49#ifdef CONFIG_NETFILTER
50static int nf_registered; 50static int nf_registered;
51#endif 51#endif
52#endif 52#endif
53 53
@@ -70,7 +70,7 @@ static int ingress_graft(struct Qdisc *sch,unsigned long arg,
70 DPRINTK("ingress_graft(sch %p,[qdisc %p],new %p,old %p)\n", 70 DPRINTK("ingress_graft(sch %p,[qdisc %p],new %p,old %p)\n",
71 sch, p, new, old); 71 sch, p, new, old);
72 DPRINTK("\n ingress_graft: You cannot add qdiscs to classes"); 72 DPRINTK("\n ingress_graft: You cannot add qdiscs to classes");
73 return 1; 73 return 1;
74} 74}
75 75
76 76
@@ -162,7 +162,7 @@ static int ingress_enqueue(struct sk_buff *skb,struct Qdisc *sch)
162 case TC_ACT_QUEUED: 162 case TC_ACT_QUEUED:
163 result = TC_ACT_STOLEN; 163 result = TC_ACT_STOLEN;
164 break; 164 break;
165 case TC_ACT_RECLASSIFY: 165 case TC_ACT_RECLASSIFY:
166 case TC_ACT_OK: 166 case TC_ACT_OK:
167 case TC_ACT_UNSPEC: 167 case TC_ACT_UNSPEC:
168 default: 168 default:
@@ -172,7 +172,7 @@ static int ingress_enqueue(struct sk_buff *skb,struct Qdisc *sch)
172 }; 172 };
173/* backward compat */ 173/* backward compat */
174#else 174#else
175#ifdef CONFIG_NET_CLS_POLICE 175#ifdef CONFIG_NET_CLS_POLICE
176 switch (result) { 176 switch (result) {
177 case TC_POLICE_SHOT: 177 case TC_POLICE_SHOT:
178 result = NF_DROP; 178 result = NF_DROP;
@@ -232,14 +232,14 @@ static unsigned int ingress_drop(struct Qdisc *sch)
232#ifdef CONFIG_NETFILTER 232#ifdef CONFIG_NETFILTER
233static unsigned int 233static unsigned int
234ing_hook(unsigned int hook, struct sk_buff **pskb, 234ing_hook(unsigned int hook, struct sk_buff **pskb,
235 const struct net_device *indev, 235 const struct net_device *indev,
236 const struct net_device *outdev, 236 const struct net_device *outdev,
237 int (*okfn)(struct sk_buff *)) 237 int (*okfn)(struct sk_buff *))
238{ 238{
239 239
240 struct Qdisc *q; 240 struct Qdisc *q;
241 struct sk_buff *skb = *pskb; 241 struct sk_buff *skb = *pskb;
242 struct net_device *dev = skb->dev; 242 struct net_device *dev = skb->dev;
243 int fwres=NF_ACCEPT; 243 int fwres=NF_ACCEPT;
244 244
245 DPRINTK("ing_hook: skb %s dev=%s len=%u\n", 245 DPRINTK("ing_hook: skb %s dev=%s len=%u\n",
@@ -247,7 +247,7 @@ ing_hook(unsigned int hook, struct sk_buff **pskb,
247 skb->dev ? (*pskb)->dev->name : "(no dev)", 247 skb->dev ? (*pskb)->dev->name : "(no dev)",
248 skb->len); 248 skb->len);
249 249
250/* 250/*
251revisit later: Use a private since lock dev->queue_lock is also 251revisit later: Use a private since lock dev->queue_lock is also
252used on the egress (might slow things for an iota) 252used on the egress (might slow things for an iota)
253*/ 253*/
@@ -257,8 +257,8 @@ used on the egress (might slow things for an iota)
257 if ((q = dev->qdisc_ingress) != NULL) 257 if ((q = dev->qdisc_ingress) != NULL)
258 fwres = q->enqueue(skb, q); 258 fwres = q->enqueue(skb, q);
259 spin_unlock(&dev->queue_lock); 259 spin_unlock(&dev->queue_lock);
260 } 260 }
261 261
262 return fwres; 262 return fwres;
263} 263}
264 264
@@ -296,7 +296,7 @@ static int ingress_init(struct Qdisc *sch,struct rtattr *opt)
296 printk("Ingress scheduler: Classifier actions prefered over netfilter\n"); 296 printk("Ingress scheduler: Classifier actions prefered over netfilter\n");
297#endif 297#endif
298#endif 298#endif
299 299
300#ifndef CONFIG_NET_CLS_ACT 300#ifndef CONFIG_NET_CLS_ACT
301#ifdef CONFIG_NETFILTER 301#ifdef CONFIG_NETFILTER
302 if (!nf_registered) { 302 if (!nf_registered) {
@@ -417,7 +417,7 @@ static int __init ingress_module_init(void)
417 417
418 return ret; 418 return ret;
419} 419}
420static void __exit ingress_module_exit(void) 420static void __exit ingress_module_exit(void)
421{ 421{
422 unregister_qdisc(&ingress_qdisc_ops); 422 unregister_qdisc(&ingress_qdisc_ops);
423#ifndef CONFIG_NET_CLS_ACT 423#ifndef CONFIG_NET_CLS_ACT