Re: Resubmit: PATCH: fix qdisc return code

2006-01-08 Thread David S. Miller
From: Jamal Hadi Salim <[EMAIL PROTECTED]> Date: Sun, 08 Jan 2006 14:34:03 -0500 > Ok, heres a resubmit after discussion with Patrick. Applied, thanks Jamal. - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at h

Re: PATCH: fix qdisc return code

2006-01-08 Thread Patrick McHardy
Jamal Hadi Salim wrote: On Sun, 2006-08-01 at 20:34 +0100, Patrick McHardy wrote: Looking at it again, I think you should not change the existing return code but just use NET_XMIT_BYPASS for the TC_ACT_SHOT (TC_POLICE_SHOT) case. Otherwise you will also return it if the packet couldn't be class

Re: PATCH: fix qdisc return code

2006-01-08 Thread Jamal Hadi Salim
On Sun, 2006-08-01 at 20:34 +0100, Patrick McHardy wrote: > Jamal Hadi Salim wrote: > > Maybe no need to worry about both situations for now, i will resubmit > > the patch without worrying about NET_XMIT_DROP. > > Looking at it again, I think you should not change the existing return > code but j

Re: PATCH: fix qdisc return code

2006-01-08 Thread Patrick McHardy
Jamal Hadi Salim wrote: Maybe no need to worry about both situations for now, i will resubmit the patch without worrying about NET_XMIT_DROP. Looking at it again, I think you should not change the existing return code but just use NET_XMIT_BYPASS for the TC_ACT_SHOT (TC_POLICE_SHOT) case. Othe

Resubmit: PATCH: fix qdisc return code

2006-01-08 Thread Jamal Hadi Salim
Ok, heres a resubmit after discussion with Patrick. cheers, jamal The mapping between TC_ACTION_SHOT and the qdisc return codes is better suited to NET_XMIT_BYPASS so as not to confuse TCP Signed-off-by: Jamal Hadi Salim <[EMAIL PROTECTED]> --- diff --git a/net/sched/sch_cbq.c b/net/sched/sch_c

Re: PATCH: fix qdisc return code

2006-01-08 Thread Jamal Hadi Salim
On Sun, 2006-08-01 at 20:01 +0100, Patrick McHardy wrote: > Jamal Hadi Salim wrote: [..] > > I could get rid of that - but there is one dilemma: > > There are really two reasons to ask the qdisc to drop > > 1) policy said so > > 2) an error happened > > In both cases NET_XMIT_DROP can not happen.

Re: PATCH: fix qdisc return code

2006-01-08 Thread Patrick McHardy
Jamal Hadi Salim wrote: On Sun, 2006-08-01 at 19:35 +0100, Patrick McHardy wrote: Jamal Hadi Salim wrote: [..] if (cl == NULL) { - if (ret == NET_XMIT_DROP) + if (ret == NET_XMIT_DROP || ret == NET_XMIT_BYPASS) No objections to the new mapping, but the

Re: PATCH: fix qdisc return code

2006-01-08 Thread Jamal Hadi Salim
On Sun, 2006-08-01 at 19:35 +0100, Patrick McHardy wrote: > Jamal Hadi Salim wrote: [..] > > if (cl == NULL) { > > - if (ret == NET_XMIT_DROP) > > + if (ret == NET_XMIT_DROP || ret == NET_XMIT_BYPASS) > > No objections to the new mapping, but the NET_XMIT_DROP handling > he

Re: PATCH: fix qdisc return code

2006-01-08 Thread Patrick McHardy
Jamal Hadi Salim wrote: The little discussion going on reminds me of this other patch i was sitting on. Patrick made the last changes to this area. Dave please apply if ACK from Patrick. --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c @@ -257,7 +257,7 @@ cbq_classify(struct sk_buff *skb, str

PATCH: fix qdisc return code

2006-01-08 Thread Jamal Hadi Salim
The little discussion going on reminds me of this other patch i was sitting on. Patrick made the last changes to this area. Dave please apply if ACK from Patrick. cheers, jamal The mapping between TC_ACTION_SHOT and the qdisc return codes is better suited to NET_XMIT_BYPASS so as not to confuse