iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[NET_SCHED]: sch_atm: act_api support

Browse Source 
Handle act_api classification results.

The ATM scheduler behaves slightly different than other schedulers
in that it only handles policer results for successful classifications,
this behaviour is retained for the act_api case.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2007-07-15 00:01:49 -07:00 committed by David S. Miller
parent b0188d4dbe
commit 9210080445
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
net/sched/sch_atm.c
View File

@ -411,11 +411,21 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
if (flow->vcc) if (flow->vcc)
ATM_SKB(skb)->atm_options = flow->vcc->atm_options; ATM_SKB(skb)->atm_options = flow->vcc->atm_options;
/*@@@ looks good ... but it's not supposed to work :-) */ /*@@@ looks good ... but it's not supposed to work :-) */
#ifdef CONFIG_NET_CLS_POLICE #ifdef CONFIG_NET_CLS_ACT
switch (result) {
case TC_ACT_QUEUED:
case TC_ACT_STOLEN:
kfree_skb(skb);
return NET_XMIT_SUCCESS;
case TC_ACT_SHOT:
kfree_skb(skb);
goto drop;
}
#elif defined(CONFIG_NET_CLS_POLICE)
switch (result) { switch (result) {
case TC_POLICE_SHOT: case TC_POLICE_SHOT:
kfree_skb(skb); kfree_skb(skb);
break; goto drop;
case TC_POLICE_RECLASSIFY: case TC_POLICE_RECLASSIFY:
if (flow->excess) if (flow->excess)
flow = flow->excess; flow = flow->excess;
@ -431,11 +441,8 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
} }
#endif #endif
} }
if ( if ((ret = flow->q->enqueue(skb, flow->q)) != 0) {
#ifdef CONFIG_NET_CLS_POLICE drop: __maybe_unused
result == TC_POLICE_SHOT ||
#endif
(ret = flow->q->enqueue(skb, flow->q)) != 0) {
sch->qstats.drops++; sch->qstats.drops++;
if (flow) if (flow)
flow->qstats.drops++; flow->qstats.drops++;