aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_ingress.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2007-07-30 20:07:14 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-07-31 05:28:18 -0400
commitbdba91ec70fb5ccbdeb1c7068319adc6ea9e1a7d (patch)
treea5897654a7a6ef6338ea15bab7d11b2315b4f19e /net/sched/sch_ingress.c
parent20283d84c7d922ca225b20db651d9a062716e8e3 (diff)
[NET_SCHED]: Fix prio/ingress classification logic error
Fix handling of empty or completely non-matching filter chains. In that case -1 is returned and tcf_result is uninitialized, the qdisc should fall back to default classification in that case. Noticed by PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_ingress.c')
-rw-r--r--net/sched/sch_ingress.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index 51f16b0af198..2d32fd27496e 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -158,9 +158,8 @@ static int ingress_enqueue(struct sk_buff *skb,struct Qdisc *sch)
158 break; 158 break;
159 case TC_ACT_RECLASSIFY: 159 case TC_ACT_RECLASSIFY:
160 case TC_ACT_OK: 160 case TC_ACT_OK:
161 case TC_ACT_UNSPEC:
162 default:
163 skb->tc_index = TC_H_MIN(res.classid); 161 skb->tc_index = TC_H_MIN(res.classid);
162 default:
164 result = TC_ACT_OK; 163 result = TC_ACT_OK;
165 break; 164 break;
166 } 165 }