SOURCES (LINUX_2_6_22): linux-htb.patch - drop one part

[arekm]

Author: arekm                        Date: Tue Dec 11 09:02:06 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6_22
---- Log message:
- drop one part

---- Files affected:
SOURCES:
   linux-htb.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/linux-htb.patch
diff -u SOURCES/linux-htb.patch:1.1.2.1 SOURCES/linux-htb.patch:1.1.2.2
--- SOURCES/linux-htb.patch:1.1.2.1	Tue Dec 11 09:35:44 2007
+++ SOURCES/linux-htb.patch	Tue Dec 11 10:02:01 2007
@@ -87,16 +87,6 @@
  
  	/* non shaped skbs; let them go directly thru */
  	struct sk_buff_head direct_queue;
-@@ -280,9 +249,6 @@ static struct htb_class *htb_classify(struct sk_buff *skb, struct Qdisc *sch,
- 		case TC_ACT_SHOT:
- 			return NULL;
- 		}
--#elif defined(CONFIG_NET_CLS_POLICE)
--		if (result == TC_POLICE_SHOT)
--			return HTB_DIRECT;
- #endif
- 		if ((cl = (void *)res.class) == NULL) {
- 			if (res.classid == sch->handle)
 @@ -634,13 +600,14 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
  		cl->qstats.drops++;
  		return NET_XMIT_DROP;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-htb.patch?r1=1.1.2.1&r2=1.1.2.2&f=u